]> 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: e285d87 32fd355)
Merge remote-tracking branch 'origin/hammer'
authorJosh Durgin <jdurgin@redhat.com>
Thu, 26 Feb 2015 02:52:36 +0000 (18:52 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 26 Feb 2015 02:52:36 +0000 (18:52 -0800)
1  2 
src/mon/Monitor.cc patch | diff1 | diff2 | blob | history
src/osd/OSD.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.