]> 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: 04d0738 e27a78c)
Merge remote-tracking branch 'ceph/master' into ses5
authorNathan Cutler <ncutler@suse.com>
Wed, 2 Aug 2017 14:38:12 +0000 (16:38 +0200)
committerNathan Cutler <ncutler@suse.com>
Wed, 2 Aug 2017 14:38:12 +0000 (16:38 +0200)
1  2 
src/CMakeLists.txt patch | diff1 | diff2 | blob | history
src/osd/PrimaryLogPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.