]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/hammer'
authorSage Weil <sage@redhat.com>
Fri, 6 Feb 2015 11:04:09 +0000 (03:04 -0800)
committerSage Weil <sage@redhat.com>
Fri, 6 Feb 2015 11:04:09 +0000 (03:04 -0800)
commita08d3be0533832d5711e44d3f2901fa4a3e79894
tree779dc3dfacd899ba6f665bac29ca6855fce8e017
parent6d72a1f0403bf7a08dd63a8fd439a81ffebccc5f
parent69288ce45852bd504460630d22edac5f5fcec71a
Merge remote-tracking branch 'gh/hammer'
src/client/Client.cc
src/osd/ReplicatedPG.cc