]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-11470'
authorJoao Eduardo Luis <joao@suse.de>
Thu, 16 Jul 2015 15:21:18 +0000 (16:21 +0100)
committerJoao Eduardo Luis <joao@suse.de>
Thu, 16 Jul 2015 15:21:18 +0000 (16:21 +0100)
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/mon/Monitor.cc

Simple merge