Merge branch 'master' into 7748-datamanager-dry-run
authorradhika <radhika@curoverse.com>
Wed, 2 Dec 2015 17:30:10 +0000 (12:30 -0500)
committerradhika <radhika@curoverse.com>
Wed, 2 Dec 2015 17:30:10 +0000 (12:30 -0500)
commitbbf13d5bc532c5222a933317461f187a0e118c9a
tree6320f67a3d95c902b4be469578fd35490a52c562
parenta2d956a99bb08ff983b667c8af7d528aa0e8d5ba
parent7ed2f9d875d69b1494372c0cb790b18187dbacf2
Merge branch 'master' into 7748-datamanager-dry-run

Conflicts:
services/datamanager/datamanager_test.go
services/datamanager/datamanager_test.go
services/datamanager/keep/keep.go
services/datamanager/keep/keep_test.go