]> 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: de3b5c4 f6406c9)
Merge pull request #3485 from jdurgin/wip-merge-diff-testing
authorSage Weil <sage@redhat.com>
Mon, 2 Feb 2015 11:07:36 +0000 (03:07 -0800)
committerSage Weil <sage@redhat.com>
Mon, 2 Feb 2015 11:07:36 +0000 (03:07 -0800)
Improve merge-diff test

1  2 
src/include/rados/librados.h patch | diff1 | diff2 | blob | history

diff --cc src/include/rados/librados.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.