Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Wed, 18 Nov 2015 13:38:38 +0000 (08:38 -0500)
committerradhika <radhika@curoverse.com>
Wed, 18 Nov 2015 13:38:38 +0000 (08:38 -0500)
commitd7a0d54602493bfdfe4a69887f0c2627ccc6d461
treecb14e768a2c668660369d8e5f1073dd8092bb5a1
parent7b223f5209150fe125f611a8e218e5fbbf8a73ee
parent84260dab5182907cae91849acd652c138c2d5095
Merge branch 'master' into 7490-datamanager-dont-die-return-error