From: Sage Weil <sage@redhat.com>
Date: Sun, 15 Nov 2015 02:40:42 +0000 (-0500)
Subject: Merge pull request #6439 from XinzeChi/wip-merge-tnx
X-Git-Tag: v10.0.1~64
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b9251b4b6fee45b092e446301f5183873158bcc7;p=ceph.git

Merge pull request #6439 from XinzeChi/wip-merge-tnx

osd: merge local_t and op_t txn to single one

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

b9251b4b6fee45b092e446301f5183873158bcc7