Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into testRecord
Showing
- README.md 8 additions, 5 deletionsREADME.md
- akka-bbb-apps/build.sbt 6 additions, 4 deletionsakka-bbb-apps/build.sbt
- akka-bbb-apps/project/Dependencies.scala 3 additions, 2 deletionsakka-bbb-apps/project/Dependencies.scala
- akka-bbb-apps/run.sh 6 additions, 1 deletionakka-bbb-apps/run.sh
- akka-bbb-apps/src/main/resources/README 0 additions, 0 deletionsakka-bbb-apps/src/main/resources/README
- akka-bbb-apps/src/universal/conf/application.conf 0 additions, 0 deletionsakka-bbb-apps/src/universal/conf/application.conf
- akka-bbb-apps/src/universal/conf/application.ini 0 additions, 42 deletionsakka-bbb-apps/src/universal/conf/application.ini
- akka-bbb-apps/src/universal/conf/logback.xml 1 addition, 0 deletionsakka-bbb-apps/src/universal/conf/logback.xml
- akka-bbb-fsesl/build.sbt 2 additions, 5 deletionsakka-bbb-fsesl/build.sbt
- akka-bbb-fsesl/project/Dependencies.scala 2 additions, 1 deletionakka-bbb-fsesl/project/Dependencies.scala
- akka-bbb-fsesl/src/main/resources/README 0 additions, 0 deletionsakka-bbb-fsesl/src/main/resources/README
- akka-bbb-fsesl/src/main/resources/logback.xml 1 addition, 0 deletionsakka-bbb-fsesl/src/main/resources/logback.xml
- akka-bbb-fsesl/src/universal/conf/application.conf 37 additions, 0 deletionsakka-bbb-fsesl/src/universal/conf/application.conf
- akka-bbb-fsesl/src/universal/conf/logback.xml 30 additions, 0 deletionsakka-bbb-fsesl/src/universal/conf/logback.xml
- bbb-common-message/project/Dependencies.scala 1 addition, 1 deletionbbb-common-message/project/Dependencies.scala
- bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala 12 additions, 0 deletions...ain/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala
- bbb-common-message/src/main/scala/org/bigbluebutton/common2/redis/RedisConfiguration.scala 2 additions, 0 deletions.../org/bigbluebutton/common2/redis/RedisConfiguration.scala
- bbb-common-web/project/Dependencies.scala 2 additions, 1 deletionbbb-common-web/project/Dependencies.scala
- bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 12 additions, 3 deletions...b/src/main/java/org/bigbluebutton/api/MeetingService.java
- bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java 25 additions, 16 deletions...src/main/java/org/bigbluebutton/api/RecordingService.java
Loading
Please register or sign in to comment