Commit Graph

6 Commits

Author SHA1 Message Date
xluandc
8f95a50e9f set fetch size. 2019-02-13 13:14:36 -05:00
Xiaocheng Luan
ca308fac2c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
	src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
2019-02-13 12:36:48 -05:00
Sean McIlvenna
4aaf6038cd Adding logging for some of the configurable properties 2019-02-11 17:21:32 -08:00
Sean McIlvenna
e752a99366 Using server_address property for tester config because otherwise the UI may use the wrong address 2019-02-11 16:44:43 -08:00
Sean McIlvenna
0bf713a60d Merge branch 'master' into more_properties
# Conflicts:
#	src/main/java/ca/uhn/fhir/jpa/starter/HapiProperties.java
#	src/main/resources/hapi.properties
2019-02-11 11:57:32 -08:00
James Agnew
c604d8be53 Improve multiversion support 2019-02-11 08:59:37 -05:00