From: Sage Weil <sage@redhat.com>
Date: Sun, 24 Apr 2016 19:47:22 +0000 (-0400)
Subject: Merge pull request #8707 from liewegas/wip-kv-merge
X-Git-Tag: v11.0.0~845
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=93d7deff53be62eea3dbf1ab7bd19df18c0edbdc;p=ceph-ci.git

Merge pull request #8707 from liewegas/wip-kv-merge

kv: add merge operator support, fix test

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

93d7deff53be62eea3dbf1ab7bd19df18c0edbdc