]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Fri, 1 Aug 2014 14:08:28 +0000 (07:08 -0700)
committerSage Weil <sage@redhat.com>
Fri, 1 Aug 2014 14:08:28 +0000 (07:08 -0700)
commitcd64a63db003cda310d983b225bbb789552bc3a9
tree7df7dfe38c531d87538317753536a61dad989d21
parentc2fc1a942964fade41cce3902f96615578aa911a
parenta00777f428df49911cef08161ed88e9759de3d1e
Merge remote-tracking branch 'gh/next'
src/common/config_opts.h
src/mon/OSDMonitor.cc