Merge branch 'master' into 6260-test-datamanager
authorradhika <radhika@curoverse.com>
Mon, 14 Sep 2015 19:23:21 +0000 (15:23 -0400)
committerradhika <radhika@curoverse.com>
Mon, 14 Sep 2015 19:23:21 +0000 (15:23 -0400)
commitc5eed3ffad31ff92f8399d32c57a710681c79caa
treead9154b49015e74014ef518d1e3fb12a2712739a
parent1082979bc8a783e8f488bcccb5a1797b7d2bfa48
parent0041395d00cda5ddeb488dae2d9fae7b6b437c9d
Merge branch 'master' into 6260-test-datamanager

Conflicts:
services/keepstore/keepstore.go
services/keepstore/keepstore.go