]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c468507 3578b11)
Merge remote-tracking branch 'origin/wip-9339' into wip-sam-testing-firefly
authorSamuel Just <sam.just@inktank.com>
Sun, 21 Sep 2014 17:03:53 +0000 (10:03 -0700)
committerSamuel Just <sam.just@inktank.com>
Sun, 21 Sep 2014 17:03:53 +0000 (10:03 -0700)
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.