Merge branch 'master' into 7241-azure-blob-volume
authorTom Clegg <tom@curoverse.com>
Tue, 29 Sep 2015 18:22:22 +0000 (14:22 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 29 Sep 2015 18:26:41 +0000 (14:26 -0400)
commit46b11ba2ed71e2c074e9e6c8f5b9f7a003e7067f
tree4765a46ce0e1705111332926c9dfb23710b6621c
parente9f437d9e590cc37ada8534401d254bd5e0a5e85
parent4e8c321b344d8ec23de7ee7c68b2553d87defb67
Merge branch 'master' into 7241-azure-blob-volume

Conflicts:
services/keepstore/volume_generic_test.go
services/keepstore/handlers_with_generic_volume_test.go
services/keepstore/collision.go
services/keepstore/handlers_with_generic_volume_test.go
services/keepstore/keepstore.go
services/keepstore/keepstore_test.go
services/keepstore/volume_generic_test.go