Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Fri, 20 Nov 2015 14:31:24 +0000 (09:31 -0500)
committerradhika <radhika@curoverse.com>
Fri, 20 Nov 2015 14:31:24 +0000 (09:31 -0500)
commit013a5d60ce55b627f314ed05000e4a7fa6b1cae8
treec06f1ae3c0524b6e5f73002b23f81001fac0ac1c
parent74e4c93a1f333352914314b3a53172a0164a20e9
parent76683cdf4d90868944a51e6b433dce3ff8f5495e
Merge branch 'master' into 7490-datamanager-dont-die-return-error