]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2862 from ceph/wip-log-client
authorSamuel Just <sam.just@inktank.com>
Mon, 10 Nov 2014 22:47:15 +0000 (14:47 -0800)
committerSamuel Just <sam.just@inktank.com>
Mon, 10 Nov 2014 22:47:15 +0000 (14:47 -0800)
osd, mds: fix cluster log

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
1  2 
src/mds/MDS.cc
src/mds/MDS.h

diff --cc src/mds/MDS.cc
Simple merge
diff --cc src/mds/MDS.h
Simple merge