]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'gh/next'
authorSage Weil <sage@redhat.com>
Thu, 24 Jul 2014 02:14:52 +0000 (19:14 -0700)
committerSage Weil <sage@redhat.com>
Thu, 24 Jul 2014 02:14:52 +0000 (19:14 -0700)
1  2 
src/osd/ReplicatedPG.cc
src/osd/osd_types.h
src/rgw/rgw_common.cc

Simple merge
Simple merge
Simple merge