]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3366 from ceph/wip-formatter
authorDan Mick <dan.mick@redhat.com>
Wed, 14 Jan 2015 23:25:25 +0000 (15:25 -0800)
committerDan Mick <dan.mick@redhat.com>
Wed, 14 Jan 2015 23:25:25 +0000 (15:25 -0800)
formatter: improve pretty output, rename factory method

Reviewed-by: Dan Mick <dan.mick@redhat.com>
1  2 
src/client/Client.cc
src/common/ceph_context.cc
src/mds/MDS.cc
src/mon/MDSMonitor.cc
src/osd/OSD.cc
src/osd/ReplicatedPG.cc

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