Merge branch 'master' into 7490-datamanager-dont-die-return-error
authorradhika <radhika@curoverse.com>
Fri, 20 Nov 2015 21:32:29 +0000 (16:32 -0500)
committerradhika <radhika@curoverse.com>
Fri, 20 Nov 2015 21:32:29 +0000 (16:32 -0500)
commit1bac47fce49d9bf1515ff525244cb36ea733a2e3
tree85d08a4cb94595ac9e58cfb2b5561e81d4355546
parent190433c5fcece3e1675adad98684f5a93f837b2c
parent8b3478bda6764b3f30aef69ec0a93729495296c0
Merge branch 'master' into 7490-datamanager-dont-die-return-error