Build #2,131

Plan branch:

Build: #2131 was successful Scheduled with changes by Cosmin Ioan <cioan@pih.org> and Mark Goodrich <mark.goodrich@live.com>

Code commits

openmrs-core master

  • Mark Goodrich <mark.goodrich@live.com>

    Mark Goodrich <mark.goodrich@live.com> 3e6cde866a417b3f11b5af11c590cdbec24c317c

    Merge pull request #3046 from cioan/TRUNK-5682
    TRUNK-5682: Expand OrderSearchCriteria

  • Cosmin Ioan <cioan@pih.org>

    Cosmin Ioan <cioan@pih.org> e289780dd38cd8002e603dc6c94fbb4e65e4ceeb

    TRUNK-5682, add test cases for OrderSearchCriteria parameters

    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version e289780dd38cd8002e603dc6c94fbb4e65e4ceeb)
    • api/src/main/java/org/openmrs/parameter/OrderSearchCriteria.java (version e289780dd38cd8002e603dc6c94fbb4e65e4ceeb)
    • api/src/main/java/org/openmrs/parameter/OrderSearchCriteriaBuilder.java (version e289780dd38cd8002e603dc6c94fbb4e65e4ceeb)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version e289780dd38cd8002e603dc6c94fbb4e65e4ceeb)
  • Cosmin Ioan <cioan@pih.org>

    Cosmin Ioan <cioan@pih.org> cc7a26b4c2e403de08bae117a193dfedb78c5219

    TRUNK-5682, expand OrderSearchCriteria with new search parameters

    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version cc7a26b4c2e403de08bae117a193dfedb78c5219)
    • api/src/main/java/org/openmrs/parameter/OrderSearchCriteria.java (version cc7a26b4c2e403de08bae117a193dfedb78c5219)
    • api/src/main/java/org/openmrs/parameter/OrderSearchCriteriaBuilder.java (version cc7a26b4c2e403de08bae117a193dfedb78c5219)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version cc7a26b4c2e403de08bae117a193dfedb78c5219)
  • Cosmin Ioan <cioan@pih.org>

    Cosmin Ioan <cioan@pih.org> 51261573a62afaf58f4f8f79ce3946863060f606

    Merge branch 'master' of https://github.com/cioan/openmrs-core

  • Mark Goodrich <mark.goodrich@live.com>

    Mark Goodrich <mark.goodrich@live.com> 0aacf195c61d35d4c957f8cfc12ac4584448b226

    Merge pull request #3040 from brandones/TRUNK-5675-analyzer-defs-programmatic
    TRUNK-5675  Lucene Analyzer Defs should be provided programatically

  • Brandon Istenes <bistenes@gmail.com>

    Brandon Istenes <bistenes@gmail.com> 9c4f6f7c5d725d73a7bdc68d4afc3595d646333a m

    TRUNK-5675  Lucene Analyzer Defs should be provided programatically TRUNK-5675">https://issues.openmrs.org/browse/TRUNK-5675

    • api/src/main/java/org/openmrs/BaseOpenmrsObject.java (version 9c4f6f7c5d725d73a7bdc68d4afc3595d646333a)
    • api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneAnalyzerFactory.java (version 9c4f6f7c5d725d73a7bdc68d4afc3595d646333a)
    • api/src/main/resources/hibernate.cfg.xml (version 9c4f6f7c5d725d73a7bdc68d4afc3595d646333a)
  • Cosmin Ioan <cioan@pih.org>

    Cosmin Ioan <cioan@pih.org> 954a7ff61231ad2b3056c3531138a5003b6c48aa m

    Merge branch 'master' of https://github.com/openmrs/openmrs-core

  • Cosmin Ioan <cioan@pih.org>

    Cosmin Ioan <cioan@pih.org> 8195ec610226b0ca114963896bfd95979ab23ee2 m

    TRUNK-5438, add annotation @since

    • api/src/main/java/org/openmrs/Encounter.java (version 8195ec610226b0ca114963896bfd95979ab23ee2)