]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6aac312 0ce7491)
Merge branch 'wip-yrf-fix1' of git://github.com/H3C/ceph into infernalis
authorGreg Farnum <gfarnum@redhat.com>
Wed, 7 Oct 2015 17:47:21 +0000 (10:47 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Wed, 7 Oct 2015 17:47:21 +0000 (10:47 -0700)
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/mon/Monitor.cc patch | diff1 | diff2 | blob | history
src/osdc/Objecter.cc patch | diff1 | diff2 | blob | history

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