Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Thu, 19 Nov 2015 16:12:22 +0000 (11:12 -0500)
committerradhika <radhika@curoverse.com>
Thu, 19 Nov 2015 16:12:22 +0000 (11:12 -0500)
commit1795bd4ba883c85c8277848f4e1f7a4cf9983ec8
tree81711d0681d78b66db7eca7656308258d573ea19
parentd7a0d54602493bfdfe4a69887f0c2627ccc6d461
parent73a127e5492bc2711530b2f5a7c30a5021232d40
Merge branch 'master' into 7490-datamanager-dont-die-return-error