]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 74ed53b b6101e9)
Merge branch 'wip-mfsmap-features' of git://github.com/jcsp/ceph
authorGreg Farnum <gfarnum@redhat.com>
Fri, 25 Mar 2016 00:50:43 +0000 (17:50 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Fri, 25 Mar 2016 00:50:43 +0000 (17:50 -0700)
commitf474c23d7c619fe014bd4cf42cab12802f1e4e2c
treef3e46084189f8574d2981516d5590f842994854dtree | snapshot
parent74ed53b38f1e2940a9a3d2aa68a91c1359dad121commit | diff
parentb6101e91f56e4dfbc7d8e041512d1600d2e67d5acommit | diff
Merge branch 'wip-mfsmap-features' of git://github.com/jcsp/ceph

Clean up some code in the new multi-fs handling. Make its output
more precise and add some debug/repair config options.

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Conflicts:
src/mds/FSMap.cc

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/client/Client.cc diff1 | diff2 | blob | history
src/common/config_opts.h diff1 | diff2 | blob | history
src/mds/FSMap.cc diff1 | diff2 | blob | history
src/mon/MDSMonitor.cc diff1 | diff2 | blob | history
src/mon/Monitor.cc diff1 | diff2 | blob | history
src/vstart.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.