Merge branch 'master' into 7179-test-mocks
authorTom Clegg <tom@curoverse.com>
Thu, 10 Sep 2015 00:48:53 +0000 (20:48 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 10 Sep 2015 00:48:53 +0000 (20:48 -0400)
commit52cca9dc7c50ef8c54c9dc83a2ccf0129c27485e
tree59b52c7778c6538d2e4d922865a3f67ba4f83627
parent7327d3b601a50148abead0ae226176a40937e363
parentc5f81922eff0f35eb2bcf8f9da7b9da1a7f86e90
Merge branch 'master' into 7179-test-mocks

Conflicts:
services/keepstore/volume.go
services/keepstore/volume_unix_test.go
services/keepstore/volume.go
services/keepstore/volume_test.go
services/keepstore/volume_unix_test.go