Commit eb57aa7d authored 9 years ago by Anton Georgiev

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share-merging

parents fb9c63dd e464edf8

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/build.sbt 2 additions, 3 deletions

akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java 29 additions, 9 deletions

...ebutton/core/pubsub/receivers/MeetingMessageReceiver.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/GenericObjectPoolConfigWrapper.java 0 additions, 142 deletions

...core/service/recorder/GenericObjectPoolConfigWrapper.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/service/recorder/RedisDispatcher.java 8 additions, 21 deletions

.../bigbluebutton/core/service/recorder/RedisDispatcher.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 5 additions, 0 deletions

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala 5 additions, 1 deletion

...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala 9 additions, 0 deletions

...ain/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala 2 additions, 0 deletions

...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala 1 addition, 0 deletions

...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala 5 additions, 0 deletions

...gbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala 4 additions, 12 deletions

...ala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala
akka-bbb-fsesl/build.sbt 1 addition, 1 deletion

akka-bbb-fsesl/build.sbt
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java 0 additions, 2 deletions

...ton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/Boot.scala 1 addition, 1 deletion

akka-bbb-fsesl/src/main/scala/org/bigbluebutton/Boot.scala
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala 45 additions, 9 deletions

...gbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala 10 additions, 9 deletions

...ala/org/bigbluebutton/endpoint/redis/RedisPublisher.scala
bbb-common-message/build.sbt 1 addition, 1 deletion

bbb-common-message/build.sbt
bbb-common-message/src/main/java/org/bigbluebutton/common/converters/FromJsonDecoder.java 43 additions, 0 deletions

.../org/bigbluebutton/common/converters/FromJsonDecoder.java
bbb-common-message/src/main/java/org/bigbluebutton/common/converters/ToJsonEncoder.java 42 additions, 0 deletions

...va/org/bigbluebutton/common/converters/ToJsonEncoder.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/PubSubPingMessage.java 11 additions, 0 deletions

.../org/bigbluebutton/common/messages/PubSubPingMessage.java

with 224 additions and 211 deletions

Please register or to comment