Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Fri, 13 Nov 2015 18:05:09 +0000 (13:05 -0500)
committerradhika <radhika@curoverse.com>
Fri, 13 Nov 2015 18:05:09 +0000 (13:05 -0500)
commitc3f49b76d173818386f5c65db46b353e1d334d1e
treebc03ac3eff5cadca6c8ad75ee78e1ee2626124fc
parentc0b9d41a5570862dcaac06b727d88be4d0ac9dc6
parentbe2d7e55af1036699282d06f629805b6508b6ceb
Merge branch 'master' into 7490-datamanager-dont-die-return-error