Merge branch 'master' into Issue1767_RecordVideoRCML

# Conflicts: # restcomm/restcomm.application/src/main/webapp/WEB-INF/data/hsql/restcomm.script # restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/init.sql # restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisRecordingsDao.java # restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/BaseVoiceInterpreter.java
RestComm · Apr 19, 2017 · ecf2011 · ecf2011
2 parents 2877e98 + 134c42a
commit ecf2011
Show file tree

Hide file tree

Showing 223 changed files with 4,690 additions and 4,337 deletions.
diff --git a/load_tests/build-restcomm-local.sh b/load_tests/build-restcomm-local.sh
diff --git a/load_tests/collect_jmap.sh b/load_tests/collect_jmap.sh
diff --git a/load_tests/jvmtop.jar b/load_tests/jvmtop.jar
diff --git a/load_tests/jvmtop.sh b/load_tests/jvmtop.sh
diff --git a/load_tests/local_perf_test_results_April12_2016 b/load_tests/local_perf_test_results_April12_2016