Branch: refs/heads/Issue-2274
  Home:   https://github.com/RestComm/Restcomm-Connect
  Commit: 7181c62dfc682ad715764ba97756403a5d61be29
      
https://github.com/RestComm/Restcomm-Connect/commit/7181c62dfc682ad715764ba97756403a5d61be29
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-05-10 (Wed, 10 May 2017)

  Changed paths:
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf
    A 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-rvd.sh

  Log Message:
  -----------
  Added RVD configuration script for video options

- videoSupport and maxMediaFileSize options are populated from advanced.conf.

Refers #2133


  Commit: cb314a579d06901af84b53b28748089d93958ca8
      
https://github.com/RestComm/Restcomm-Connect/commit/cb314a579d06901af84b53b28748089d93958ca8
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    A .idea/codeStyleSettings.xml
    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/incoming-phone-numbers.xml
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/incoming-phone-numbers.xml
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/configuration/sets/MainConfigurationSet.java
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/configuration/sets/impl/MainConfigurationSetImpl.java
    M 
restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/IncomingPhoneNumbersDao.java
    M 
restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisIncomingPhoneNumbersDao.java
    M 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/incoming-phone-numbers-api.adoc
    M 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/monitoring-service.adoc
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/ExtensionsConfigurationEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SupervisorEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/SupservisorJsonEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/MonitoringServiceConverter.java
    A 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/MonitoringServiceConverterCallDetails.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
    A 
restcomm/restcomm.monitoring.service/src/main/java/org/restcomm/connect/monitoringservice/LiveCallsDetails.java
    M 
restcomm/restcomm.monitoring.service/src/main/java/org/restcomm/connect/monitoringservice/MonitoringService.java
    M 
restcomm/restcomm.mscontrol.api/src/main/java/org/restcomm/connect/mscontrol/api/messages/StopMediaGroup.java
    M 
restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsCallController.java
    M 
restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsConferenceController.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/ConferenceModeratorPresent.java
    A 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/GetStatistics.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/MonitoringServiceResponse.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Call.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/CreateCallsTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/CreateCallsWithStatusCallbackTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/LiveCallModificationTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/RestcommCallsTool.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleAnswerDelayTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTest.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ClientsDialTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialConferenceTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkAnswerDelayTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadTest_NoneSecurity.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialRecordingS3UploadTest_Secure.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialStatusCallbackTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialAnswerDelayTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ReferTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/tools/MonitoringServiceTool.java
    A 
restcomm/restcomm.testsuite/src/test/resources/restcomm.script_callRegexTest
    A restcomm/restcomm.testsuite/src/test/resources/restcomm_callRegex.xml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/RestComm/RestComm-Connect into 
issue2133_rvd_videoSupport_config


  Commit: a58dd004e519fb08045bdbfd3cd6dba25ae22017
      
https://github.com/RestComm/Restcomm-Connect/commit/a58dd004e519fb08045bdbfd3cd6dba25ae22017
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/web.xml
    A 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/cors/CorsFilter.java

  Log Message:
  -----------
  Added allow-all CORS filter

refers #2163


  Commit: 2805a23e1e326b87b615ba3b39ec4144457a6a50
      
https://github.com/RestComm/Restcomm-Connect/commit/2805a23e1e326b87b615ba3b39ec4144457a6a50
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/configuration/sets/RcmlserverConfigurationSet.java
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/configuration/sets/impl/RcmlserverConfigurationSetImpl.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/client/rcmlserver/RcmlserverApi.java
    M restcomm/restcomm.testsuite/src/test/resources/restcomm-accountRemoval.xml

  Log Message:
  -----------
  Reviewed restcomm.xml 'rcmlserver-api' section, configuration classes and 
RcmlserverApi class

- renamed rcmlserver-api to rcmlserver
- added api-path property

Refers #2230


  Commit: 3feaa8f0c4105f2d65fb6568578cae40b3e23f84
      
https://github.com/RestComm/Restcomm-Connect/commit/3feaa8f0c4105f2d65fb6568578cae40b3e23f84
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-15 (Thu, 15 Jun 2017)

  Changed paths:
    M restcomm/restcomm.testsuite/src/test/resources/restcomm-accountRemoval.xml

  Log Message:
  -----------
  Fixed broken AccountsEndpointClosingTest

This relates to 'rcmlserver' configuration section since it used it

Refers #2230


  Commit: ca24d22533b91774e4c7b3f8fcdcaf576081fb44
      
https://github.com/RestComm/Restcomm-Connect/commit/ca24d22533b91774e4c7b3f8fcdcaf576081fb44
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/cors/CorsFilter.java

  Log Message:
  -----------
  Load restcomm.xml and initialize CorsFilter accordingly

Refers #2230


  Commit: ef1d591e75edf57c44d03605073c0550a225db56
      
https://github.com/RestComm/Restcomm-Connect/commit/ef1d591e75edf57c44d03605073c0550a225db56
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/AccountsEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/AccountsJsonEndpoint.java

  Log Message:
  -----------
  Added OPTIONS method to AccountsEndpoint and refined security checks for 
endpoint's methods

Refers #2230


  Commit: eb071676e7e7705391f99e5e08d65659730e19d1
      
https://github.com/RestComm/Restcomm-Connect/commit/eb071676e7e7705391f99e5e08d65659730e19d1
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-16 (Fri, 16 Jun 2017)

  Changed paths:
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/web.xml
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/cors/CorsFilter.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/CorsRelaxTest.java
    A restcomm/restcomm.testsuite/src/test/resources/restcomm-corsRelax.xml

  Log Message:
  -----------
  Reviewed CorsFilter initialization and added automated test

Refers #2230


  Commit: 66864c8a282ba798325d20c091388681c84b2b7e
      
https://github.com/RestComm/Restcomm-Connect/commit/66864c8a282ba798325d20c091388681c84b2b7e
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/cors/CorsFilter.java

  Log Message:
  -----------
  Added log message upon initialization of CORS filter

Refers #2230


  Commit: 0db6385d80aebacd6cb65024e2417030d674593a
      
https://github.com/RestComm/Restcomm-Connect/commit/0db6385d80aebacd6cb65024e2417030d674593a
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/incoming-phone-numbers.xml
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/incoming-phone-numbers.xml
    M 
restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/IncomingPhoneNumbersDao.java
    M 
restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/IncomingPhoneNumberFilter.java
    M 
restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisIncomingPhoneNumbersDao.java
    M 
restcomm/restcomm.dao/src/test/java/org/restcomm/connect/dao/mybatis/IncomingPhoneNumbersDaoTest.java
    M restcomm/restcomm.dao/src/test/resources/incoming-phone-numbers.xml
    M 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/sdks/restcomm-client-android-sdk-quick-start.adoc
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/IncomingPhoneNumbersEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/IncomingPhoneNumbersJsonEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/IncomingPhoneNumbersXmlEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/IncomingPhoneNumberListConverter.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/provisioning/number/vi/IncomingPhoneNumbersEndpointTest.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/provisioning/number/vi/RestcommIncomingPhoneNumberTool.java
    M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_dialTest
    M restcomm/restcomm.ui/src/main/webapp/modules/logs-calls.html
    M restcomm/restcomm.ui/src/main/webapp/modules/logs-messages.html
    M restcomm/restcomm.ui/src/main/webapp/modules/logs-notifications.html
    M restcomm/restcomm.ui/src/main/webapp/modules/logs-recordings.html
    M restcomm/restcomm.ui/src/main/webapp/modules/logs-transcriptions.html
    M restcomm/restcomm.ui/src/main/webapp/modules/numbers-incoming.html
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/numbers-incoming.js

  Log Message:
  -----------
  Merge branch 'master' into issue2230_configurable_CORS_headers


  Commit: d3b46e6f430ed924bc38a78b7094738c6321ed3e
      
https://github.com/RestComm/Restcomm-Connect/commit/d3b46e6f430ed924bc38a78b7094738c6321ed3e
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh

  Log Message:
  -----------
  Configures <rcmlserver>/<base-url> setting based on RVD_URL parameter of 
advanced.conf

Refers #2212


  Commit: 08cf59a1f2d6af412fc7e4cfacd7dc4e70329865
      
https://github.com/RestComm/Restcomm-Connect/commit/08cf59a1f2d6af412fc7e4cfacd7dc4e70329865
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/web.xml
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/configuration/sets/RcmlserverConfigurationSet.java
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/configuration/sets/impl/RcmlserverConfigurationSetImpl.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/AccountsJsonEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/client/rcmlserver/RcmlserverApi.java
    A 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/cors/CorsFilter.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/CorsRelaxTest.java
    M restcomm/restcomm.testsuite/src/test/resources/restcomm-accountRemoval.xml
    A restcomm/restcomm.testsuite/src/test/resources/restcomm-corsRelax.xml

  Log Message:
  -----------
  Merge branch 'issue2230_configurable_CORS_headers' into 
issue2212_rcmlserver_baseurl_configuration


  Commit: 0483339819330d12b3e68ab06d95bb3ea7f3437d
      
https://github.com/RestComm/Restcomm-Connect/commit/0483339819330d12b3e68ab06d95bb3ea7f3437d
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-21 (Wed, 21 Jun 2017)

  Changed paths:
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml

  Log Message:
  -----------
  Populate <rcmlserver>/<base-url> using a sed command instead of xmlstarlet 
for compatibility reasons

Refers #2212


  Commit: 0cdfafea5154aeea0617e2bbad135ad74e8553b5
      
https://github.com/RestComm/Restcomm-Connect/commit/0cdfafea5154aeea0617e2bbad135ad74e8553b5
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    A CONTRIBUTING.asciidoc
    M README.md
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml
    A 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/telephony/ProxyRule.java
    R 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims/Restcomm_IMS_GW.adoc
    R 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims/images/webrtc_call_hold.png
    R 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims/images/webrtc_client_outgoing_call.png
    R 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims/images/webrtc_client_registration.png
    R 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims/images/webrtc_incoming_call.png
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/Restcomm_ActAsProxy.adoc
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/Restcomm_IMS_GW.adoc
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/images/RestcommB2BUA.png
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/images/webrtc_call_hold.png
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/images/webrtc_client_outgoing_call.png
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/images/webrtc_client_registration.png
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/images/webrtc_incoming_call.png
    M 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/index.adoc
    M restcomm/restcomm.mgcp/pom.xml
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/MockMediaGateway.java
    M 
restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/smpp/SmppMessageHandler.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Call.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyAnswerDelayTest.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyTest.java
    A 
restcomm/restcomm.testsuite/src/test/resources/restcomm.script_acting_as_proxy
    A 
restcomm/restcomm.testsuite/src/test/resources/restcomm_acting_as_proxy.xml
    A 
restcomm/restcomm.testsuite/src/test/resources/restcomm_acting_as_proxy_answer_delay.xml
    M 
restcomm/restcomm.ui/src/main/webapp/modules/modals/modal-register-sip-client.html
    M restcomm/restcomm.ui/src/main/webapp/resources/css/dashboard.css
    A 
restcomm/restcomm.ui/src/main/webapp/resources/img/v2/restcomm-console-inside.png
    A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/restcomm-console.png
    M restcomm/restcomm.ui/src/main/webapp/templates/navbar.html

  Log Message:
  -----------
  Merge branch 'master' into issue2212_rcmlserver_baseurl_configuration


  Commit: 05130bf72ea114d9b016dc2ddb57221c8d2d71e9
      
https://github.com/RestComm/Restcomm-Connect/commit/05130bf72ea114d9b016dc2ddb57221c8d2d71e9
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M .gitignore
    A .travis.yml
    A CONTRIBUTING.asciidoc
    M README.md
    A architecture_diagrams/README.asciidoc
    A build.sh
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/incoming-phone-numbers.xml
    M 
restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/incoming-phone-numbers.xml
    A 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/telephony/CreateCallType.java
    A 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/telephony/ProxyRule.java
    M 
restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/IncomingPhoneNumbersDao.java
    M 
restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/entities/IncomingPhoneNumberFilter.java
    M 
restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisIncomingPhoneNumbersDao.java
    M 
restcomm/restcomm.dao/src/test/java/org/restcomm/connect/dao/mybatis/IncomingPhoneNumbersDaoTest.java
    M restcomm/restcomm.dao/src/test/resources/incoming-phone-numbers.xml
    M 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/calls-api.adoc
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/images/status-callback-events-dial.png
    M 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/incoming-phone-numbers-api.adoc
    M restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/index.adoc
    R 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims/Restcomm_IMS_GW.adoc
    R 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims/images/webrtc_call_hold.png
    R 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims/images/webrtc_client_outgoing_call.png
    R 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims/images/webrtc_client_registration.png
    R 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims/images/webrtc_incoming_call.png
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/Restcomm_ActAsProxy.adoc
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/Restcomm_IMS_GW.adoc
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/images/RestcommB2BUA.png
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/images/webrtc_call_hold.png
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/images/webrtc_client_outgoing_call.png
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/images/webrtc_client_registration.png
    A 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/ims_b2bua/images/webrtc_incoming_call.png
    M 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/configuration/index.adoc
    M 
restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/sdks/restcomm-client-android-sdk-quick-start.adoc
    R 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/CallRequest.java
    M 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/ExtensionRequest.java
    A 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/IExtensionCreateCallRequest.java
    A 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/IExtensionCreateSmsSessionRequest.java
    A 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/IExtensionRequest.java
    R 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/MessageExtensionResponse.java
    R 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/NodeExtensionResponse.java
    M 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/RestcommExtensionGeneric.java
    R 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/SessionExtensionResponse.java
    R 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/SystemExtensionResponse.java
    R 
restcomm/restcomm.extension.api/src/main/java/org/restcomm/connect/extension/api/TransactionExtensionResponse.java
    M 
restcomm/restcomm.extension.controller/src/main/java/org/restcomm/connect/extension/controller/ExtensionController.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/CallsEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/GatewaysEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/IncomingPhoneNumbersEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/IncomingPhoneNumbersJsonEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/IncomingPhoneNumbersXmlEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/OutboundProxyEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/UssdPushEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/client/Downloader.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/converter/IncomingPhoneNumberListConverter.java
    M 
restcomm/restcomm.identity/src/main/java/org/restcomm/connect/identity/passwords/JavascriptPasswordValidator.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/SubVoiceInterpreter.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
    M restcomm/restcomm.mgcp/pom.xml
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/GenericEndpoint.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/MockMediaGateway.java
    M restcomm/restcomm.sms.api/pom.xml
    M 
restcomm/restcomm.sms.api/src/main/java/org/restcomm/connect/sms/api/CreateSmsSession.java
    M 
restcomm/restcomm.sms.api/src/main/java/org/restcomm/connect/sms/api/SmsSessionRequest.java
    M 
restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/SmsService.java
    M 
restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/smpp/SmppMessageHandler.java
    M restcomm/restcomm.telephony.api/pom.xml
    M 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/CallInfo.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/CreateCall.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/InitializeOutbound.java
    M restcomm/restcomm.telephony/pom.xml
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Call.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/provisioning/number/vi/IncomingPhoneNumbersEndpointTest.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/provisioning/number/vi/RestcommIncomingPhoneNumberTool.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallLifecycleTestLive.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/CallRegexSingleTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialForkTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/DialStatusCallbackTest.java
    M 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ImsClientsDialTest.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyAnswerDelayTest.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/RestcommActingAsProxyTest.java
    A 
restcomm/restcomm.testsuite/src/test/resources/restcomm.script_acting_as_proxy
    A 
restcomm/restcomm.testsuite/src/test/resources/restcomm.script_callRegexTest2
    M restcomm/restcomm.testsuite/src/test/resources/restcomm.script_dialTest
    A 
restcomm/restcomm.testsuite/src/test/resources/restcomm_acting_as_proxy.xml
    A 
restcomm/restcomm.testsuite/src/test/resources/restcomm_acting_as_proxy_answer_delay.xml
    M restcomm/restcomm.ui/src/main/webapp/modules/logs-calls.html
    M restcomm/restcomm.ui/src/main/webapp/modules/logs-messages.html
    M restcomm/restcomm.ui/src/main/webapp/modules/logs-notifications.html
    M restcomm/restcomm.ui/src/main/webapp/modules/logs-recordings.html
    M restcomm/restcomm.ui/src/main/webapp/modules/logs-transcriptions.html
    M 
restcomm/restcomm.ui/src/main/webapp/modules/modals/modal-register-sip-client.html
    M restcomm/restcomm.ui/src/main/webapp/modules/numbers-incoming.html
    M restcomm/restcomm.ui/src/main/webapp/resources/css/dashboard.css
    A 
restcomm/restcomm.ui/src/main/webapp/resources/img/v2/restcomm-console-inside.png
    A restcomm/restcomm.ui/src/main/webapp/resources/img/v2/restcomm-console.png
    M 
restcomm/restcomm.ui/src/main/webapp/resources/js/controllers/numbers-incoming.js
    M restcomm/restcomm.ui/src/main/webapp/templates/navbar.html
    M 
restcomm/restcomm.ussd/src/main/java/org/restcomm/connect/ussd/interpreter/UssdInterpreter.java
    M 
restcomm/restcomm.ussd/src/main/java/org/restcomm/connect/ussd/telephony/UssdCall.java
    A sonar-project.properties

  Log Message:
  -----------
  Merge branch 'master' into issue2133_rvd_videoSupport_config


  Commit: 9092ef21f7df0a88a87bdffafe8f611767a2eae3
      
https://github.com/RestComm/Restcomm-Connect/commit/9092ef21f7df0a88a87bdffafe8f611767a2eae3
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf
    A 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-rvd.sh

  Log Message:
  -----------
  Merge branch 'issue2133_rvd_videoSupport_config' into 
cors_support_and_video_config


  Commit: b1985de0a77284b945762210a9ad3f2bb0795316
      
https://github.com/RestComm/Restcomm-Connect/commit/b1985de0a77284b945762210a9ad3f2bb0795316
  Author: Maria Farooq <[email protected]>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/MediaGateway.java

  Log Message:
  -----------
  added more logs


  Commit: 3fef6d4aff91af3841a80795aa66655ff0972654
      
https://github.com/RestComm/Restcomm-Connect/commit/3fef6d4aff91af3841a80795aa66655ff0972654
  Author: Maria Farooq <[email protected]>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M 
restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/MediaResourceBrokerGeneric.java

  Log Message:
  -----------
  no need to clean MGs #        2306 MG will do itself since its instance wide 
cleanup, MG might get cleaned before even this point.


  Commit: 39392ed1322c08dbddc91a1da039aa9ab858ff96
      
https://github.com/RestComm/Restcomm-Connect/commit/39392ed1322c08dbddc91a1da039aa9ab858ff96
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-rvd.sh

  Log Message:
  -----------
  Case insensitive comparison for RVD_VIDEO_SUPPORT in config-rvd.sh


  Commit: 9c29739641b1b5d886d5ff8bfcc62821841a6f77
      
https://github.com/RestComm/Restcomm-Connect/commit/9c29739641b1b5d886d5ff8bfcc62821841a6f77
  Author: Maria Farooq <[email protected]>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/Connection.java
    M 
restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/MediaResourceBrokerGeneric.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java

  Log Message:
  -----------
  improved logging


  Commit: b9c31a6bb97b9b6093deb534a79e526d08d24a7b
      
https://github.com/RestComm/Restcomm-Connect/commit/b9c31a6bb97b9b6093deb534a79e526d08d24a7b
  Author: George Vagenas <[email protected]>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/cache/DiskCache.java

  Log Message:
  -----------
  Patch for Play verb to support URL that don't point to wav files
This close #2308


  Commit: 8ae5985f193726ca1ecf832bcdd38748f7174be3
      
https://github.com/RestComm/Restcomm-Connect/commit/8ae5985f193726ca1ecf832bcdd38748f7174be3
  Author: George Vagenas <[email protected]>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/Connection.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/MediaGateway.java
    M 
restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/MediaResourceBrokerGeneric.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:RestComm/Restcomm-Connect


  Commit: 9c5eddc130ad061d3b391ff023b4d78ddd0b5426
      
https://github.com/RestComm/Restcomm-Connect/commit/9c5eddc130ad061d3b391ff023b4d78ddd0b5426
  Author: Orestis Tsakiridis <[email protected]>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh
    A 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-rvd.sh
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/web.xml
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/configuration/sets/RcmlserverConfigurationSet.java
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/configuration/sets/impl/RcmlserverConfigurationSetImpl.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/AccountsJsonEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/client/rcmlserver/RcmlserverApi.java
    A 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/cors/CorsFilter.java
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/CorsRelaxTest.java
    M restcomm/restcomm.testsuite/src/test/resources/restcomm-accountRemoval.xml
    A restcomm/restcomm.testsuite/src/test/resources/restcomm-corsRelax.xml

  Log Message:
  -----------
  Merge branch 'cors_support_and_video_config'

Merges PRs #2136, #2253, #2268


  Commit: 43d54c0dffde2d3339bcef4b7c8c0bb5f6e68d3b
      
https://github.com/RestComm/Restcomm-Connect/commit/43d54c0dffde2d3339bcef4b7c8c0bb5f6e68d3b
  Author: Alexandre Mendonça <[email protected]>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-olympus.sh

  Log Message:
  -----------
  Update Olympus configuration script to XML config file


  Commit: eb9b87c04e7b6a51b0b7fc2569f7147bad210116
      
https://github.com/RestComm/Restcomm-Connect/commit/eb9b87c04e7b6a51b0b7fc2569f7147bad210116
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/GenericEndpoint.java
    M 
restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MgcpMediaGroup.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/MmsCallController.java
    M 
restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsConferenceController.java

  Log Message:
  -----------
  patched #2310


  Commit: 3ba284ce8afe4ede6248ec4238565d41c4d2bb62
      
https://github.com/RestComm/Restcomm-Connect/commit/3ba284ce8afe4ede6248ec4238565d41c4d2bb62
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/ConferenceStateChanged.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java

  Log Message:
  -----------
  patched #2312


  Commit: d241597a2f218a7a293df92c85c86d38f1a47f40
      
https://github.com/RestComm/Restcomm-Connect/commit/d241597a2f218a7a293df92c85c86d38f1a47f40
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/AbstractMockMediaGateway.java
    A 
restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/EndpointTest.java

  Log Message:
  -----------
  added testcases for #2310


  Commit: a65d8c0c45231e6c38189f87f905bd2a5f59810d
      
https://github.com/RestComm/Restcomm-Connect/commit/a65d8c0c45231e6c38189f87f905bd2a5f59810d
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/EndpointTest.java

  Log Message:
  -----------
  updated auther


  Commit: 2974321ea558f12fc0a25b5df31f11dfcf6a2522
      
https://github.com/RestComm/Restcomm-Connect/commit/2974321ea558f12fc0a25b5df31f11dfcf6a2522
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/ConferenceStateChanged.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java

  Log Message:
  -----------
  Revert "patched #2312"

This reverts commit 3ba284ce8afe4ede6248ec4238565d41c4d2bb62.


  Commit: e8b4845de90d77c7e95c176abf8a3142ba9c56de
      
https://github.com/RestComm/Restcomm-Connect/commit/e8b4845de90d77c7e95c176abf8a3142ba9c56de
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/GenericEndpoint.java
    M 
restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/AbstractMockMediaGateway.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/MmsCallController.java

  Log Message:
  -----------
  updated authors


  Commit: 05e3f692378c1f1e13820c63cce9151d3686c122
      
https://github.com/RestComm/Restcomm-Connect/commit/05e3f692378c1f1e13820c63cce9151d3686c122
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/EndpointTest.java

  Log Message:
  -----------
  remove uncesary mthods


  Commit: abcc72bf11176ec407700f55c54cc0f0c90929fe
      
https://github.com/RestComm/Restcomm-Connect/commit/abcc72bf11176ec407700f55c54cc0f0c90929fe
  Author: maria-farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/GenericEndpoint.java
    M 
restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/AbstractMockMediaGateway.java
    A 
restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/EndpointTest.java
    M 
restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MgcpMediaGroup.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/MmsCallController.java
    M 
restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsConferenceController.java

  Log Message:
  -----------
  Merge pull request #2314 from RestComm/issue-2310

Issue 2310


  Commit: 20920904c41c83ecedf9c845ab9913cc7d5cfc5a
      
https://github.com/RestComm/Restcomm-Connect/commit/20920904c41c83ecedf9c845ab9913cc7d5cfc5a
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/ConferenceStateChanged.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java

  Log Message:
  -----------
  patched #2312 in seperate branch


  Commit: 0a283e0c03f661b506252fb795fba226783e43f1
      
https://github.com/RestComm/Restcomm-Connect/commit/0a283e0c03f661b506252fb795fba226783e43f1
  Author: Alexandre Mendonça <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-olympus.sh

  Log Message:
  -----------
  Merge pull request #2309 from ammendonca/OLYMPUS-XML-CONFIG

Update Olympus configuration script to XML config file


  Commit: e29e463ae764ad1e196ce084e0d9a96f6a0becdf
      
https://github.com/RestComm/Restcomm-Connect/commit/e29e463ae764ad1e196ce084e0d9a96f6a0becdf
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java

  Log Message:
  -----------
  rename actor to proper name


  Commit: 1cdc44815f369c68b2086cfab4d4bc44ec713037
      
https://github.com/RestComm/Restcomm-Connect/commit/1cdc44815f369c68b2086cfab4d4bc44ec713037
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java

  Log Message:
  -----------
  added more logs for unhandles cases


  Commit: 1d76b1253b503772a45803fcc9736a365e1db4b6
      
https://github.com/RestComm/Restcomm-Connect/commit/1d76b1253b503772a45803fcc9736a365e1db4b6
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
    A restcomm/restcomm.telephony/resources/dao-manager.xml
    A restcomm/restcomm.telephony/resources/data/hsql/restcomm.log
    A restcomm/restcomm.telephony/resources/data/hsql/restcomm.properties
    A restcomm/restcomm.telephony/resources/data/hsql/restcomm.script
    A restcomm/restcomm.telephony/resources/log4j.xml
    A restcomm/restcomm.telephony/resources/mappers/accounts.xml
    A restcomm/restcomm.telephony/resources/mappers/announcements.xml
    A restcomm/restcomm.telephony/resources/mappers/applications.xml
    A restcomm/restcomm.telephony/resources/mappers/available-phone-numbers.xml
    A restcomm/restcomm.telephony/resources/mappers/call-detail-records.xml
    A restcomm/restcomm.telephony/resources/mappers/clients.xml
    A 
restcomm/restcomm.telephony/resources/mappers/conference-detail-records.xml
    A restcomm/restcomm.telephony/resources/mappers/extensions-configuration.xml
    A restcomm/restcomm.telephony/resources/mappers/gateways.xml
    A restcomm/restcomm.telephony/resources/mappers/http-cookies.xml
    A restcomm/restcomm.telephony/resources/mappers/incoming-phone-numbers.xml
    A 
restcomm/restcomm.telephony/resources/mappers/media-resource-broker-entity.xml
    A restcomm/restcomm.telephony/resources/mappers/media-servers.xml
    A restcomm/restcomm.telephony/resources/mappers/notifications.xml
    A restcomm/restcomm.telephony/resources/mappers/outgoing-caller-ids.xml
    A restcomm/restcomm.telephony/resources/mappers/recordings.xml
    A restcomm/restcomm.telephony/resources/mappers/registrations.xml
    A restcomm/restcomm.telephony/resources/mappers/sand-boxes.xml
    A restcomm/restcomm.telephony/resources/mappers/short-codes.xml
    A restcomm/restcomm.telephony/resources/mappers/sms-messages.xml
    A restcomm/restcomm.telephony/resources/mappers/transcriptions.xml
    A restcomm/restcomm.telephony/resources/mybatis.xml
    A restcomm/restcomm.telephony/resources/restcomm-node2.xml
    A restcomm/restcomm.telephony/resources/restcomm.xml
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockFailingMmsConferenceController.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockFailingMmsControllerFactory.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockMmsConferenceController.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockMmsControllerFactory.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/telephony/ConferenceTest.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/telephony/util/ConferenceTestUtil.java
    A restcomm/restcomm.telephony/src/test/resources/dao-manager.xml
    A restcomm/restcomm.telephony/src/test/resources/data/hsql/restcomm.log
    A 
restcomm/restcomm.telephony/src/test/resources/data/hsql/restcomm.properties
    A restcomm/restcomm.telephony/src/test/resources/data/hsql/restcomm.script
    A restcomm/restcomm.telephony/src/test/resources/log4j.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/accounts.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/announcements.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/applications.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/available-phone-numbers.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/call-detail-records.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/clients.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/conference-detail-records.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/extensions-configuration.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/gateways.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/http-cookies.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/incoming-phone-numbers.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/media-resource-broker-entity.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/media-servers.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/notifications.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/outgoing-caller-ids.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/recordings.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/registrations.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/sand-boxes.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/short-codes.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/sms-messages.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/transcriptions.xml
    A restcomm/restcomm.telephony/src/test/resources/mybatis.xml
    A restcomm/restcomm.telephony/src/test/resources/restcomm-node2.xml
    A restcomm/restcomm.telephony/src/test/resources/restcomm.xml

  Log Message:
  -----------
  added test cases for conference ceneter and conference #2312


  Commit: 29b863650b218d3edb66c5ce9bd752863380043d
      
https://github.com/RestComm/Restcomm-Connect/commit/29b863650b218d3edb66c5ce9bd752863380043d
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java
    M 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockMmsControllerFactory.java
    M 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/telephony/ConferenceTest.java

  Log Message:
  -----------
  added test for joining completed conference #2312


  Commit: 70c9ddb4135ce980f0953aa8283ab6ea04187714
      
https://github.com/RestComm/Restcomm-Connect/commit/70c9ddb4135ce980f0953aa8283ab6ea04187714
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
    M 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/telephony/ConferenceTest.java

  Log Message:
  -----------
  fixed and cs fix


  Commit: 3fc83559e44f039d8b253faadf2b7b89e0f9a798
      
https://github.com/RestComm/Restcomm-Connect/commit/3fc83559e44f039d8b253faadf2b7b89e0f9a798
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/telephony/ConferenceTest.java
    R restcomm/restcomm.telephony/src/test/resources/data/hsql/restcomm.log
    R 
restcomm/restcomm.telephony/src/test/resources/data/hsql/restcomm.properties
    R restcomm/restcomm.telephony/src/test/resources/data/hsql/restcomm.script
    R restcomm/restcomm.telephony/src/test/resources/restcomm-node2.xml

  Log Message:
  -----------
  remove unecasry files


  Commit: 3520d986e2f25f1f1172ad80068928fc5c25b3f1
      
https://github.com/RestComm/Restcomm-Connect/commit/3520d986e2f25f1f1172ad80068928fc5c25b3f1
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java

  Log Message:
  -----------
  fixed cs error


  Commit: b2cf7c5ad2cfef509e62f0bd4575939d5670cf5c
      
https://github.com/RestComm/Restcomm-Connect/commit/b2cf7c5ad2cfef509e62f0bd4575939d5670cf5c
  Author: maria-farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/ConferenceStateChanged.java
    A restcomm/restcomm.telephony/resources/dao-manager.xml
    A restcomm/restcomm.telephony/resources/data/hsql/restcomm.log
    A restcomm/restcomm.telephony/resources/data/hsql/restcomm.properties
    A restcomm/restcomm.telephony/resources/data/hsql/restcomm.script
    A restcomm/restcomm.telephony/resources/log4j.xml
    A restcomm/restcomm.telephony/resources/mappers/accounts.xml
    A restcomm/restcomm.telephony/resources/mappers/announcements.xml
    A restcomm/restcomm.telephony/resources/mappers/applications.xml
    A restcomm/restcomm.telephony/resources/mappers/available-phone-numbers.xml
    A restcomm/restcomm.telephony/resources/mappers/call-detail-records.xml
    A restcomm/restcomm.telephony/resources/mappers/clients.xml
    A 
restcomm/restcomm.telephony/resources/mappers/conference-detail-records.xml
    A restcomm/restcomm.telephony/resources/mappers/extensions-configuration.xml
    A restcomm/restcomm.telephony/resources/mappers/gateways.xml
    A restcomm/restcomm.telephony/resources/mappers/http-cookies.xml
    A restcomm/restcomm.telephony/resources/mappers/incoming-phone-numbers.xml
    A 
restcomm/restcomm.telephony/resources/mappers/media-resource-broker-entity.xml
    A restcomm/restcomm.telephony/resources/mappers/media-servers.xml
    A restcomm/restcomm.telephony/resources/mappers/notifications.xml
    A restcomm/restcomm.telephony/resources/mappers/outgoing-caller-ids.xml
    A restcomm/restcomm.telephony/resources/mappers/recordings.xml
    A restcomm/restcomm.telephony/resources/mappers/registrations.xml
    A restcomm/restcomm.telephony/resources/mappers/sand-boxes.xml
    A restcomm/restcomm.telephony/resources/mappers/short-codes.xml
    A restcomm/restcomm.telephony/resources/mappers/sms-messages.xml
    A restcomm/restcomm.telephony/resources/mappers/transcriptions.xml
    A restcomm/restcomm.telephony/resources/mybatis.xml
    A restcomm/restcomm.telephony/resources/restcomm-node2.xml
    A restcomm/restcomm.telephony/resources/restcomm.xml
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockFailingMmsConferenceController.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockFailingMmsControllerFactory.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockMmsConferenceController.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockMmsControllerFactory.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/telephony/ConferenceTest.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/telephony/util/ConferenceTestUtil.java
    A restcomm/restcomm.telephony/src/test/resources/dao-manager.xml
    A restcomm/restcomm.telephony/src/test/resources/log4j.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/accounts.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/announcements.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/applications.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/available-phone-numbers.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/call-detail-records.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/clients.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/conference-detail-records.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/extensions-configuration.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/gateways.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/http-cookies.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/incoming-phone-numbers.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/media-resource-broker-entity.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/media-servers.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/notifications.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/outgoing-caller-ids.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/recordings.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/registrations.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/sand-boxes.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/short-codes.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/sms-messages.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/transcriptions.xml
    A restcomm/restcomm.telephony/src/test/resources/mybatis.xml
    A restcomm/restcomm.telephony/src/test/resources/restcomm.xml

  Log Message:
  -----------
  Merge pull request #2316 from RestComm/issue-2312

Issue 2312


  Commit: a3ab372a3c7ddfb356716e37f6a95028423f70ba
      
https://github.com/RestComm/Restcomm-Connect/commit/a3ab372a3c7ddfb356716e37f6a95028423f70ba
  Author: maria-farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/mediaserver.conf

  Log Message:
  -----------
  added MEDIA_MAX_DURATION #2317


  Commit: ee9f5f4cefc1aaae547e5b44a70c673f064a11c1
      
https://github.com/RestComm/Restcomm-Connect/commit/ee9f5f4cefc1aaae547e5b44a70c673f064a11c1
  Author: maria-farooq <[email protected]>
  Date:   2017-07-04 (Tue, 04 Jul 2017)

  Changed paths:
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/mediaserver.conf

  Log Message:
  -----------
  added DTMF_DETECTOR_TONE_INTERVAL #2303


  Commit: f4eacb59e1fa4a551fb4e5b357c3c3dd386d1b96
      
https://github.com/RestComm/Restcomm-Connect/commit/f4eacb59e1fa4a551fb4e5b357c3c3dd386d1b96
  Author: Maria Farooq <[email protected]>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/BridgeEndpoint.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/ConferenceEndpoint.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/IvrEndpoint.java

  Log Message:
  -----------
  fixed #2319


  Commit: b9ba103e7b74a7d0a49bb05c3e04edf30ef0ca47
      
https://github.com/RestComm/Restcomm-Connect/commit/b9ba103e7b74a7d0a49bb05c3e04edf30ef0ca47
  Author: Jean Deruelle <[email protected]>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Integrating black duck software copilot for license check


  Commit: 94fd38f536c8ed04b9246a9048a1c9df9f05ea16
      
https://github.com/RestComm/Restcomm-Connect/commit/94fd38f536c8ed04b9246a9048a1c9df9f05ea16
  Author: Jean Deruelle <[email protected]>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  trying blackhub copilot


  Commit: b1f0ba18c23c45d02f59a62c26f6bbe81c248709
      
https://github.com/RestComm/Restcomm-Connect/commit/b1f0ba18c23c45d02f59a62c26f6bbe81c248709
  Author: agafox <[email protected]>
  Date:   2017-07-06 (Thu, 06 Jul 2017)

  Changed paths:
    M .travis.yml
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/advanced.conf
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-olympus.sh
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-restcomm.sh
    A 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/autoconfig.d/config-rvd.sh
    M 
restcomm/configuration/config-scripts/as7-config-scripts/restcomm/mediaserver.conf
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/conf/restcomm.xml
    M restcomm/restcomm.application/src/main/webapp/WEB-INF/web.xml
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/cache/DiskCache.java
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/configuration/sets/RcmlserverConfigurationSet.java
    M 
restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/configuration/sets/impl/RcmlserverConfigurationSetImpl.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/AccountsJsonEndpoint.java
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/client/rcmlserver/RcmlserverApi.java
    A 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/cors/CorsFilter.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/BridgeEndpoint.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/ConferenceEndpoint.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/Connection.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/GenericEndpoint.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/IvrEndpoint.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/MediaGateway.java
    M 
restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/AbstractMockMediaGateway.java
    A 
restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/EndpointTest.java
    M 
restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/MediaResourceBrokerGeneric.java
    M 
restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MgcpMediaGroup.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/MmsCallController.java
    M 
restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsConferenceController.java
    M 
restcomm/restcomm.telephony.api/src/main/java/org/restcomm/connect/telephony/api/ConferenceStateChanged.java
    A restcomm/restcomm.telephony/resources/dao-manager.xml
    A restcomm/restcomm.telephony/resources/data/hsql/restcomm.log
    A restcomm/restcomm.telephony/resources/data/hsql/restcomm.properties
    A restcomm/restcomm.telephony/resources/data/hsql/restcomm.script
    A restcomm/restcomm.telephony/resources/log4j.xml
    A restcomm/restcomm.telephony/resources/mappers/accounts.xml
    A restcomm/restcomm.telephony/resources/mappers/announcements.xml
    A restcomm/restcomm.telephony/resources/mappers/applications.xml
    A restcomm/restcomm.telephony/resources/mappers/available-phone-numbers.xml
    A restcomm/restcomm.telephony/resources/mappers/call-detail-records.xml
    A restcomm/restcomm.telephony/resources/mappers/clients.xml
    A 
restcomm/restcomm.telephony/resources/mappers/conference-detail-records.xml
    A restcomm/restcomm.telephony/resources/mappers/extensions-configuration.xml
    A restcomm/restcomm.telephony/resources/mappers/gateways.xml
    A restcomm/restcomm.telephony/resources/mappers/http-cookies.xml
    A restcomm/restcomm.telephony/resources/mappers/incoming-phone-numbers.xml
    A 
restcomm/restcomm.telephony/resources/mappers/media-resource-broker-entity.xml
    A restcomm/restcomm.telephony/resources/mappers/media-servers.xml
    A restcomm/restcomm.telephony/resources/mappers/notifications.xml
    A restcomm/restcomm.telephony/resources/mappers/outgoing-caller-ids.xml
    A restcomm/restcomm.telephony/resources/mappers/recordings.xml
    A restcomm/restcomm.telephony/resources/mappers/registrations.xml
    A restcomm/restcomm.telephony/resources/mappers/sand-boxes.xml
    A restcomm/restcomm.telephony/resources/mappers/short-codes.xml
    A restcomm/restcomm.telephony/resources/mappers/sms-messages.xml
    A restcomm/restcomm.telephony/resources/mappers/transcriptions.xml
    A restcomm/restcomm.telephony/resources/mybatis.xml
    A restcomm/restcomm.telephony/resources/restcomm-node2.xml
    A restcomm/restcomm.telephony/resources/restcomm.xml
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockFailingMmsConferenceController.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockFailingMmsControllerFactory.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockMmsConferenceController.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/mscontrol/mms/MockMmsControllerFactory.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/telephony/ConferenceTest.java
    A 
restcomm/restcomm.telephony/src/main/test/org/restcomm/connect/telephony/util/ConferenceTestUtil.java
    A restcomm/restcomm.telephony/src/test/resources/dao-manager.xml
    A restcomm/restcomm.telephony/src/test/resources/log4j.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/accounts.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/announcements.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/applications.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/available-phone-numbers.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/call-detail-records.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/clients.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/conference-detail-records.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/extensions-configuration.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/gateways.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/http-cookies.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/incoming-phone-numbers.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/media-resource-broker-entity.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/media-servers.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/notifications.xml
    A 
restcomm/restcomm.telephony/src/test/resources/mappers/outgoing-caller-ids.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/recordings.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/registrations.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/sand-boxes.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/short-codes.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/sms-messages.xml
    A restcomm/restcomm.telephony/src/test/resources/mappers/transcriptions.xml
    A restcomm/restcomm.telephony/src/test/resources/mybatis.xml
    A restcomm/restcomm.telephony/src/test/resources/restcomm.xml
    A 
restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/CorsRelaxTest.java
    M restcomm/restcomm.testsuite/src/test/resources/restcomm-accountRemoval.xml
    A restcomm/restcomm.testsuite/src/test/resources/restcomm-corsRelax.xml

  Log Message:
  -----------
  Merge Issue-2274 with origin/master

# Conflicts:
#       
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
#       
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java
#       
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java


  Commit: f429cc7138831f68dc0a63d76847febe594e7db9
      
https://github.com/RestComm/Restcomm-Connect/commit/f429cc7138831f68dc0a63d76847febe594e7db9
  Author: agafox <[email protected]>
  Date:   2017-07-06 (Thu, 06 Jul 2017)

  Changed paths:
    M 
restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/AccountsEndpoint.java
    M 
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
    M 
restcomm/restcomm.mgcp/src/main/java/org/restcomm/connect/mgcp/IvrEndpoint.java
    M 
restcomm/restcomm.mgcp/src/test/java/org/restcomm/connect/mgcp/EndpointTest.java
    M 
restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/MediaResourceBrokerGeneric.java
    M 
restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MgcpMediaGroup.java
    M 
restcomm/restcomm.mscontrol.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsConferenceController.java
    M 
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java

  Log Message:
  -----------
  Merge Issue-2274 with origin/master

# Conflicts:
#       
restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java
#       
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Conference.java
#       
restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/ConferenceCenter.java


Compare: 
https://github.com/RestComm/Restcomm-Connect/compare/e7f8a9382d5f...f429cc713883

-- 

--- 
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 [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to