Branch: refs/heads/master Home: https://github.com/RestComm/sbc Commit: 844ce8e27ec5a520350e017720e52e7c32246862 https://github.com/RestComm/sbc/commit/844ce8e27ec5a520350e017720e52e7c32246862 Author: Oscar <ocarri...@eolos.la> Date: 2018-04-26 (Thu, 26 Apr 2018)
Changed paths: M .classpath M application/.classpath M application/pom.xml M application/src/main/java/org/restcomm/sbc/bo/Connector.java M application/src/main/java/org/restcomm/sbc/managers/NetworkManager.java A application/src/main/java/org/restcomm/sbc/media/srtp/.gitignore A application/src/main/java/org/restcomm/sbc/media/srtp/X509CERTGenerator.java A application/src/main/java/org/restcomm/sbc/release.properties M application/src/main/java/org/restcomm/sbc/rest/AccountsJsonEndpoint.java A application/src/main/java/org/restcomm/sbc/rest/CORSResponseFilter.java A application/src/main/resources/org/restcomm/sbc/resources/release.properties A application/src/main/webapp/META-INF/application.xml A application/src/main/webapp/META-INF/jboss-deployment-structure.xml M application/src/main/webapp/WEB-INF/conf/mybatis.xml M application/src/main/webapp/WEB-INF/conf/sbc.xml M application/src/main/webapp/WEB-INF/data/hsql/sbc.script M application/src/main/webapp/WEB-INF/web.xml M docs/.classpath M pom.xml A release/genkeys.txt A testsuite/.checkstyle M testsuite/.classpath A testsuite/src/test/resources/web.xml Log Message: ----------- Resync repos Commit: 9b0c5c800ae1274a70c0b8de33a5fd8fb1c7201e https://github.com/RestComm/sbc/commit/9b0c5c800ae1274a70c0b8de33a5fd8fb1c7201e Author: Oscar <ocarri...@eolos.la> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M README.md M application/.classpath M application/pom.xml M application/src/main/java/org/restcomm/sbc/ServiceLauncher.java M application/src/main/java/org/restcomm/sbc/chain/impl/NATHelperProcessor.java M application/src/main/java/org/restcomm/sbc/managers/jmx/jboss/Provider.java M application/src/main/java/org/restcomm/sbc/media/MediaSession.java M application/src/main/java/org/restcomm/sbc/media/MediaZone.java M application/src/main/java/org/restcomm/sbc/rest/AccountsEndpoint.java M application/src/main/webapp/META-INF/jboss-deployment-structure.xml A application/src/main/webapp/WEB-INF/conf/sbc-tomcat.xml A application/src/main/webapp/WEB-INF/conf/sbc-wildfly.xml M application/src/main/webapp/WEB-INF/conf/sbc.xml A application/src/main/webapp/WEB-INF/conf/sbc_.xml M application/src/main/webapp/WEB-INF/sip.xml A application/src/main/webapp/WEB-INF/web-tomcat.xml A application/src/main/webapp/WEB-INF/web-wildfly.xml M application/src/main/webapp/WEB-INF/web.xml A configuration/certs-docker.sh A configuration/mss-sip-stack.properties A configuration/sbc-configuration-docker.sh A configuration/sbc-docker.sh M pom.xml M release/build.xml M testsuite/.classpath Log Message: ----------- Merge remote-tracking branch 'RestComm/master' # Conflicts: # application/.classpath # application/src/main/webapp/META-INF/jboss-deployment-structure.xml # application/src/main/webapp/WEB-INF/conf/sbc.xml # application/src/main/webapp/WEB-INF/web.xml # pom.xml # testsuite/.classpath Commit: 67b543b782b17c1c0deee904614013a411393cad https://github.com/RestComm/sbc/commit/67b543b782b17c1c0deee904614013a411393cad Author: Jean Deruelle <jean.derue...@telestax.com> Date: 2018-04-26 (Thu, 26 Apr 2018) Changed paths: M .classpath M application/.classpath M application/pom.xml M application/src/main/java/org/restcomm/sbc/bo/Connector.java M application/src/main/java/org/restcomm/sbc/managers/NetworkManager.java A application/src/main/java/org/restcomm/sbc/media/srtp/.gitignore A application/src/main/java/org/restcomm/sbc/media/srtp/X509CERTGenerator.java A application/src/main/java/org/restcomm/sbc/release.properties M application/src/main/java/org/restcomm/sbc/rest/AccountsJsonEndpoint.java A application/src/main/java/org/restcomm/sbc/rest/CORSResponseFilter.java A application/src/main/resources/org/restcomm/sbc/resources/release.properties A application/src/main/webapp/META-INF/application.xml M application/src/main/webapp/META-INF/jboss-deployment-structure.xml M application/src/main/webapp/WEB-INF/conf/mybatis.xml M application/src/main/webapp/WEB-INF/conf/sbc.xml M application/src/main/webapp/WEB-INF/data/hsql/sbc.script M application/src/main/webapp/WEB-INF/web.xml M docs/.classpath M pom.xml A release/genkeys.txt A testsuite/.checkstyle M testsuite/.classpath A testsuite/src/test/resources/web.xml Log Message: ----------- Merge pull request #128 from ocarriles/master Back to work Compare: https://github.com/RestComm/sbc/compare/c35a4ee79632...67b543b782b1 -- --- You received this message because you are subscribed to the Google Groups "mobicents-commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to mobicents-commits+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.