Commits
![marc-danie](https://secure.gravatar.com/avatar/b044213990601210cc8f9ad89ecb7fad.jpg?s=96&d=mm)
marc-danie authored 6e14d81de17M
Merge branch 'release/1.26.6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop # Conflicts: # adapter/adapter-api/pom.xml # adapter/adapter-service/pom.xml # apps/Http4s-ServerSentEvent-war/pom.xml # apps/Http4s-ServerSentEvent/pom.xml # apps/dashboard-app/pom.xml # apps/dashboard-war/pom.xml # apps/mockcrc-app/pom.xml # apps/mockcrc-war/pom.xml # apps/shrine-api-app/pom.xml # apps/shrine-api-war/pom.xml # apps/shrine-app/pom.xml # apps/steward-app/pom.xml # apps/steward-war/pom.xml # apps/test-app/pom.xml # apps/test-war/pom.xml # apps/war/pom.xml # commons/auth/pom.xml # commons/client/pom.xml # commons/crypto/pom.xml # commons/data-commons/pom.xml # commons/email/pom.xml # commons/http4s-util/pom.xml # commons/ont-support/pom.xml # commons/protocol-query/pom.xml # commons/protocol/pom.xml # commons/test-commons/pom.xml # commons/util/pom.xml # hub/broadcaster-aggregator/pom.xml # hub/broadcaster-service/pom.xml # hub/hub-service/pom.xml # integration/pom.xml # messagequeue/messagequeueclient/pom.xml # messagequeue/messagequeuemiddleware/pom.xml # messagequeue/messagequeueservice/pom.xml # network-health/pom.xml # pom.xml # qep/service/pom.xml # qep/service/src/main/scala/net/shrine/qep/querydb/QepQueryDb.scala # services/dashboard/pom.xml # services/i2b2/pom.xml # services/qep/pom.xml # services/qep/src/main/scala/net/shrine/api/qep/QepService.scala # services/receiver/pom.xml # services/static-data/pom.xml # services/steward/pom.xml # shrine-setup/pom.xml # tools/http4s-client-test/pom.xml # tools/jmeter-automation/pom.xml # tools/pom.xml
Showing diff to1b2aeb271e0