Merge branch 'master' into github-3408-production-datamanager
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 14 Jul 2015 17:39:36 +0000 (13:39 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 14 Jul 2015 17:39:36 +0000 (13:39 -0400)
commit0e57453d2b637a3d105d4e3d67031f3915f9d302
tree48e29789706650f4c61b01865cbb203de6eda3e4
parent0dd85fcd31ef5f251dcf143fef4118d6ea56f700
parentbb8a8e8ab7dc201dccf8f2f3cf243e63ba8d14cd
Merge branch 'master' into github-3408-production-datamanager

Conflicts:
services/datamanager/keep/keep.go
services/datamanager/keep/keep.go