Rafal Korytkowski
ab2c1abe57f87b9386dc6084185e20ee10f6a533
ab2c1abe57f87b9386dc6084185e20ee10f6a533
Set version to 1.11.x
22 Jul 2014
Rafal Korytkowski
d6d061c3e4f0d2555406ce84b2de818aa068c2bc
d6d061c3e4f0d2555406ce84b2de818aa068c2bc
Merge branch 'master' into 1.11.x
Conflicts:
api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
api/src/main/java/org/openmrs/util/DoubleRange.java
api/src/main/java/org/openmrs/util/OpenmrsConstants.java
api/src/main/java/org/openmrs/util/OpenmrsUtil.java
api/src/test/java/org/openmrs/api/ConceptServiceTest.java
api/src/test/java/org/openmrs/api/impl/ConceptServiceImplTest.java
22 Jul 2014
Daniel Kayiwa
461a7ab37dd8893921ed37b91170aafc4fe16030
461a7ab37dd8893921ed37b91170aafc4fe16030
Merge pull request #989 from anotherdave/TRUNK-4212-3
TRUNK-4212 : Fix divide by zero error when repeatInterval=0, possible cau...
21 Jul 2014
anotherdave <anotherdave@users.noreply.github.com>
5ff41cdcbbcddf83a885ed55045fd33c25671453
5ff41cdcbbcddf83a885ed55045fd33c25671453
TRUNK-4212 : Fix divide by zero error when repeatInterval=0, possible cause for test failure
TRUNK-4212 : Commit task addition to database, possible cause of SchedulerServiceTest failure
TRUNK-4212 : Turn on debug logging for the duration of SchedulerServiceTest, to try to diagnose intermittent test failures
21 Jul 2014
Daniel Kayiwa
3a9c0ecbc2d9543976498ddd59ef2d1e662d4900
3a9c0ecbc2d9543976498ddd59ef2d1e662d4900
Merge pull request #988 from jkantorjunk/master
Trunk-4404: Make getDruge method case insensitive
21 Jul 2014