3021: Merge branch 'master' into 3021-leave-api-running
authorTom Clegg <tom@curoverse.com>
Fri, 6 Feb 2015 05:04:29 +0000 (00:04 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 6 Feb 2015 05:04:29 +0000 (00:04 -0500)
commita94e15cab04a19dcbb02f2e95335e337c8e55036
treef844c7d03a26b05b7a29c1d5cf9b556f40d2f042
parentaa613a590c0b03e90432c25f0190adc99ef4f657
parente5b8f6826a2034c0c7d7142cff3fb02f64fb8831
3021: Merge branch 'master' into 3021-leave-api-running

Conflicts:
sdk/python/tests/test_websockets.py
sdk/python/tests/test_websockets.py
services/api/Gemfile
services/fuse/tests/test_mount.py