Commit Graph

4 Commits

Author SHA1 Message Date
Richard Alam
8ba1e6484a Merge branch 'master' into ref-bbb-web-2
Conflicts:
	bbb-video/.gitignore
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
2011-06-16 14:49:57 -04:00
Richard Alam
69da70736b - change build using gradle
- need to add jedis plugin so we can store the start/stop broadcast event
   as the webcam status event is unreliable and can introduce sync issues.
2011-06-13 12:25:18 -04:00
Marco Calderon
5bbb607c5d Added redis pool, pubsub, and maven3 support to bbb-web 2011-05-17 11:04:40 +00:00
Richard Alam
52817279a2 - add streams directory for video and deskshare apps where we store recordings 2011-03-15 15:30:29 -04:00