Merge branch 'master' into rel_5_1_0

2020-08-13 15:57:38 -04:00
parent 2f28291681 a70fe5bfa0
commit 2805bb4683
9 changed files with 421 additions and 336 deletions
--- a/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java
+++ b/src/test/java/ca/uhn/fhir/jpa/starter/MultitenantServerR4IT.java
@@ -17,7 +17,6 @@ import org.hl7.fhir.r4.model.Parameters;
 import org.hl7.fhir.r4.model.Patient;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;

 import java.nio.file.Paths;