]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3605 from ceph/wip-da-SCA-20150129
authorSage Weil <sage@redhat.com>
Mon, 9 Feb 2015 06:27:02 +0000 (22:27 -0800)
committerSage Weil <sage@redhat.com>
Mon, 9 Feb 2015 06:27:02 +0000 (22:27 -0800)
Various SCA and smaller bugfixes

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/mds/MDS.cc
src/msg/async/AsyncConnection.h
src/osd/PG.cc
src/osd/ReplicatedPG.cc
src/rgw/rgw_rados.cc
src/test/librbd/test_librbd.cc

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