Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Fri, 6 Nov 2015 15:35:54 +0000 (10:35 -0500)
committerradhika <radhika@curoverse.com>
Fri, 6 Nov 2015 15:35:54 +0000 (10:35 -0500)
commitaf6d31cba8346ac86bc0027eb0f675144fb43056
tree5d3f13bd466f440b50bfd333dfb9d027b528ca20
parent668cf29c1a7f8270ed5ef0bcfbe693618a8155da
parent4ec9919ea6cce4ada252f1e0a0dc521fe27e508c
Merge branch 'master' into 7490-datamanager-dont-die-return-error

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