]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Mon, 5 Jan 2015 19:16:57 +0000 (11:16 -0800)
committerSage Weil <sage@redhat.com>
Mon, 5 Jan 2015 19:16:57 +0000 (11:16 -0800)
1  2 
src/client/Client.cc
src/osd/ReplicatedPG.cc

Simple merge
Simple merge