Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Wed, 11 Nov 2015 16:36:10 +0000 (11:36 -0500)
committerradhika <radhika@curoverse.com>
Wed, 11 Nov 2015 16:36:10 +0000 (11:36 -0500)
commit192e5a9d12fb9fd16baff2b61af011611b671983
treeb07447635c4cc7cc2757f8af25bdced5bfda7c3d
parent142953f3b9f4a7da5bd456c3e0c6ee93d0f54055
parent3cdc4e8e3668b783f42f887f6a8662b66ecb7f9a
Merge branch 'master' into 7490-datamanager-dont-die-return-error