Branch: refs/heads/issue1104 Home: https://github.com/RestComm/Restcomm-Connect Commit: 37b467a2b0d94da2e5612873013ce983ad95e064 https://github.com/RestComm/Restcomm-Connect/commit/37b467a2b0d94da2e5612873013ce983ad95e064 Author: Maria Farooq <maria-far...@live.com> Date: 2016-10-18 (Tue, 18 Oct 2016)
Changed paths: M restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh Log Message: ----------- Merge branch 'master' into ccProductization * master: Fixing missing package name after refactoring causing ClassNotFoundException as only the class is kept without the full package name Commit: 995336606d9ff2c5158468e218dd774dc92215b1 https://github.com/RestComm/Restcomm-Connect/commit/995336606d9ff2c5158468e218dd774dc92215b1 Author: Maria Farooq <maria-far...@live.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: A restcomm/configuration/config-scripts/as7-config-scripts/restcomm/upgrade_scripts/patches_for_790/V7_9_2_For_790_rename_account_sid_to_parent_sid_for_Accounts_Table.sql M restcomm/restcomm.application/src/main/webapp/WEB-INF/data/hsql/restcomm.script M restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/init.sql M restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/accounts.xml M restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/accounts.xml M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/AccountsDao.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/Account.java M restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisAccountsDao.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/AccountsEndpoint.java M restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SecuredEndpoint.java M restcomm/restcomm.testsuite/src/test/resources/restcomm.script M restcomm/restcomm.testsuite/src/test/resources/restcomm.script-smpp M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_SmsTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_UserAgentTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_accounts_test M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_callLifecycleTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_clients_test M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_dialActionTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_dialForkTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_dialTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_dialTest_new M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_multitenancyTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_playTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_projectMigratorWorkspaceMigratedTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_projectMigratorWorkspaceMixedTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_projectMigratorWorkspaceOriginalTest M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_roles_test M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_traffic_throttling M restcomm/restcomm.testsuite/src/test/resources/restcomm_with_Data.script Log Message: ----------- Merge branch 'master' into ccProductization * master: Account entity rename accountSid to parentSid This close #1493 Commit: c828d0aef2137674aa74b3bdd7eebf9f76c72bb0 https://github.com/RestComm/Restcomm-Connect/commit/c828d0aef2137674aa74b3bdd7eebf9f76c72bb0 Author: Maria Farooq <maria-far...@live.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M restcomm/restcomm.http/src/test/java/org/restcomm/connect/dao/AccountsDaoMock.java M restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/ConferenceMediaResourceControllerGeneric.java M restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsBridgeController.java M restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsConferenceController.java Log Message: ----------- fixed checkstyle and account testcase Commit: 138c077aeb203f0f1b1b63aad7408a9b2482580f https://github.com/RestComm/Restcomm-Connect/commit/138c077aeb203f0f1b1b63aad7408a9b2482580f Author: Maria Farooq <maria-far...@live.com> Date: 2016-10-18 (Tue, 18 Oct 2016) Changed paths: M restcomm/restcomm.http/src/test/java/org/restcomm/connect/dao/AccountsDaoMock.java M restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/ConferenceMediaResourceControllerGeneric.java M restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsBridgeController.java M restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsConferenceController.java Log Message: ----------- Merge branch 'ccProductization' into issue1104 * ccProductization: fixed checkstyle and account testcase Compare: https://github.com/RestComm/Restcomm-Connect/compare/f4e2e71f8fac...138c077aeb20 -- --- 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.