]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e1d898 4d2ad10)
Merge pull request #8707 from liewegas/wip-kv-merge
authorSage Weil <sage@redhat.com>
Sun, 24 Apr 2016 19:47:22 +0000 (15:47 -0400)
committerSage Weil <sage@redhat.com>
Sun, 24 Apr 2016 19:47:22 +0000 (15:47 -0400)
kv: add merge operator support, fix test

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.