]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/wip-5624-b' into next
authorSage Weil <sage@inktank.com>
Mon, 22 Jul 2013 21:47:18 +0000 (14:47 -0700)
committerSage Weil <sage@inktank.com>
Mon, 22 Jul 2013 21:47:18 +0000 (14:47 -0700)
Reviewed-by: David Zafman <david.zafman@inktank.com>
1  2 
src/common/config_opts.h
src/mon/Monitor.cc
src/osd/OSD.cc

Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge