]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Mon, 24 Nov 2014 02:55:32 +0000 (18:55 -0800)
committerSage Weil <sage@redhat.com>
Mon, 24 Nov 2014 02:55:32 +0000 (18:55 -0800)
commit47bc8da32952dd0617de6cf9e4f7d4d22ba4cf40
tree092ade977b32610721c66b3c51b8e9f117f9e5f8
parentca13ce1b35f0aba769bed8f057a14915264ee48f
parent9ba17a321db06d3d76c9295e411c76842194b25c
Merge remote-tracking branch 'gh/next'
src/common/config_opts.h
src/msg/simple/Pipe.cc
src/osd/ReplicatedPG.cc
src/osd/ReplicatedPG.h