Merge branch '2449-keep-write-blocks' into 2449-keep-flags
authorTim Pierce <twp@curoverse.com>
Tue, 8 Apr 2014 18:09:53 +0000 (14:09 -0400)
committerTim Pierce <twp@curoverse.com>
Tue, 8 Apr 2014 18:09:53 +0000 (14:09 -0400)
commit7ca1198b2e64cdd823f424c1bd009f364abfe2d0
treeeef0c58bbac81e0b5f379933d0bc08c3581d441e
parentc4a50125bec07063e91be6ca7c7ce209d5840642
parent4eba2cb5d7d6a5d76b9ce4d3f535a1de911400cd
Merge branch '2449-keep-write-blocks' into 2449-keep-flags

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