Merge branch '2449-keep-write-blocks' into 2449-keep-index-status-handlers
authorTim Pierce <twp@curoverse.com>
Thu, 10 Apr 2014 22:45:00 +0000 (18:45 -0400)
committerTim Pierce <twp@curoverse.com>
Thu, 10 Apr 2014 22:45:00 +0000 (18:45 -0400)
commit3c554a995e2b4f716106876ffbd311e87cce4091
tree3e68054d0eb1d2cd6e14e1f75923d8da5763d82e
parent0a09da628d4d7f1ced2daaa55603bea940b9211c
parentb452636351b19ed5641a20eabc68881bd8905ca4
Merge branch '2449-keep-write-blocks' into 2449-keep-index-status-handlers

Conflicts:
services/keep/keep.go
services/keep/keep.go
services/keep/keep_test.go