Merge branch 'development' of...
Merge branch 'development' of https://ec.europa.eu/cefdigital/code/scm/edelivery/smp into feature/EDELIVERY-8880-use-eu-login-for-smp-console-implementation-part-2 Conflicts: smp-docker/compose/tomcat-mysql-smp-sml/runCompose.sh smp-docker/compose/tomcat-mysql/runCompose.sh
No related branches found
No related tags found
Showing
- smp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh 2 additions, 0 deletionssmp-docker/compose/tomcat-mysql-smp-sml/stopClearCompose.sh
- smp-docker/compose/tomcat-mysql/runCompose.sh 2 additions, 2 deletionssmp-docker/compose/tomcat-mysql/runCompose.sh
- smp-docker/compose/tomcat-mysql/stopClearCompose.sh 2 additions, 0 deletionssmp-docker/compose/tomcat-mysql/stopClearCompose.sh
- smp-docker/compose/weblogic-oracle/stopClearCompose.sh 4 additions, 0 deletionssmp-docker/compose/weblogic-oracle/stopClearCompose.sh
- smp-docker/images/tomcat-mysql-smp-sml/Dockerfile 5 additions, 3 deletionssmp-docker/images/tomcat-mysql-smp-sml/Dockerfile
- smp-docker/images/tomcat-mysql/Dockerfile 4 additions, 4 deletionssmp-docker/images/tomcat-mysql/Dockerfile
- smp-docker/src/main/docker/doc4dev/sml-smp/Dockerfile 0 additions, 124 deletionssmp-docker/src/main/docker/doc4dev/sml-smp/Dockerfile
- smp-docker/src/main/docker/doc4dev/sml-smp/bdmsl/db.changelog-master.xml 0 additions, 42 deletions...main/docker/doc4dev/sml-smp/bdmsl/db.changelog-master.xml
- smp-docker/src/main/docker/doc4dev/sml-smp/bdmsl/db.changelog-update-3.1.RC1.xml 0 additions, 138 deletions...ker/doc4dev/sml-smp/bdmsl/db.changelog-update-3.1.RC1.xml
- smp-docker/src/main/docker/doc4dev/sml-smp/bdmsl/db.init-data-inserts.xml 0 additions, 103 deletions...ain/docker/doc4dev/sml-smp/bdmsl/db.init-data-inserts.xml
- smp-docker/src/main/docker/doc4dev/sml-smp/bdmsl/encriptionPrivateKey.private 0 additions, 1 deletion...docker/doc4dev/sml-smp/bdmsl/encriptionPrivateKey.private
- smp-docker/src/main/docker/doc4dev/sml-smp/bdmsl/keystore.jks 0 additions, 0 deletions...docker/src/main/docker/doc4dev/sml-smp/bdmsl/keystore.jks
- smp-docker/src/main/docker/doc4dev/sml-smp/bind/named.conf 0 additions, 80 deletionssmp-docker/src/main/docker/doc4dev/sml-smp/bind/named.conf
- smp-docker/src/main/docker/doc4dev/sml-smp/bind/named.conf.local 0 additions, 28 deletions...ker/src/main/docker/doc4dev/sml-smp/bind/named.conf.local
- smp-docker/src/main/docker/doc4dev/sml-smp/bind/zones/db.172.20 0 additions, 17 deletions...cker/src/main/docker/doc4dev/sml-smp/bind/zones/db.172.20
- smp-docker/src/main/docker/doc4dev/sml-smp/bind/zones/db.acc.edelivery.tech.local 0 additions, 14 deletions...er/doc4dev/sml-smp/bind/zones/db.acc.edelivery.tech.local
- smp-docker/src/main/docker/doc4dev/sml-smp/entrypoint.sh 0 additions, 150 deletionssmp-docker/src/main/docker/doc4dev/sml-smp/entrypoint.sh
- smp-soapui-tests/scripts/clean-install-smp.sh 1 addition, 1 deletionsmp-soapui-tests/scripts/clean-install-smp.sh
Loading
Please register or sign in to comment