Merge branch 'master' into 3889-functional-testing
authorradhika <radhika@curoverse.com>
Fri, 26 Sep 2014 20:03:30 +0000 (16:03 -0400)
committerradhika <radhika@curoverse.com>
Fri, 26 Sep 2014 20:03:30 +0000 (16:03 -0400)
commitbb3ec0fefd17c68d9c0123dcfcc5e4ef616fb25e
tree26c831614e59c5633736c2ea3ff1b4ae6aa48c21
parentf9ec9073f2077d81567922d612d79e8bcf3a11ba
parent0fc69ec920fb2edf48a196adfbce1e7c66218f04
Merge branch 'master' into 3889-functional-testing

Conflicts:
services/fuse/tests/test_mount.py
services/fuse/tests/test_mount.py