From: Samuel Just <sjust@redhat.com>
Date: Fri, 29 May 2015 21:20:29 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/wip-txn-noappend-sam-rebased'
X-Git-Tag: v9.0.2~87
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33150c509d33ca0fad8f19d2d9e43fe7dad57b24;p=ceph.git

Merge remote-tracking branch 'upstream/wip-txn-noappend-sam-rebased'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
---

33150c509d33ca0fad8f19d2d9e43fe7dad57b24