Merge branch 'origin-2608-websocket-event-bus-alt2'
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 30 Apr 2014 20:54:40 +0000 (16:54 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 30 Apr 2014 20:54:40 +0000 (16:54 -0400)
commit02377152d7e368b6b73b2a94ceb68c99f9d55959
treea234a5ff1f293a5a488b5bbe046babe66048d25d
parente8f81804c24307b6702b1897c80b4be832254454
parent943feeec776bb75c685cbdee9466f8db3cdf5da7
Merge branch 'origin-2608-websocket-event-bus-alt2'

Conflicts:
services/api/app/models/arvados_model.rb
services/api/test/test_helper.rb
services/api/app/controllers/application_controller.rb
services/api/app/models/arvados_model.rb
services/api/test/test_helper.rb