]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit05b0c7816ee6e45b8003eee7ed6afae4638eb9e4
treef38b1d4ae55903d122d750288b4edbbd11ce1e54
parent6aac3122407d797caf9f46ecdbc76d981d04f929
parent0ce749165a5dbd367ac8d36b642442cd16f0923c
Merge branch 'wip-yrf-fix1' of git://github.com/H3C/ceph into infernalis

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
src/mon/Monitor.cc
src/osdc/Objecter.cc