Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Mon, 9 Nov 2015 18:54:56 +0000 (13:54 -0500)
committerradhika <radhika@curoverse.com>
Mon, 9 Nov 2015 18:54:56 +0000 (13:54 -0500)
commit142953f3b9f4a7da5bd456c3e0c6ee93d0f54055
tree611f506d7211772639a61cbaff65a4b16d454a25
parentc79792f08d8faf712f70c67ed1216feabc5d9408
parent5d74e7583ad4b2d5dfd9eec50d625eded3739d1c
Merge branch 'master' into 7490-datamanager-dont-die-return-error