Merge branch 'master' into PAN-70

2019-05-01 22:21:44 -06:00
parent 681a484e27 766ba2753a
commit ec0572fb76
7 changed files with 135 additions and 2 deletions
@@ -1,2 +1,6 @@
 spring.mvc.view.prefix:/WEB-INF/jsp/
-spring.mvc.view.suffix:.jsp
+spring.mvc.view.suffix:.jsp
+
+persistence.api.connection.timeout.milliseconds=5000
+persistence.api.socket.timeout.milliseconds=10000
+persistence.api.base.url=http://localhost:8090/