]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Wed, 22 Sep 2010 20:45:13 +0000 (13:45 -0700)
committerSage Weil <sage@newdream.net>
Wed, 22 Sep 2010 20:45:13 +0000 (13:45 -0700)
1  2 
src/msg/SimpleMessenger.cc
src/rgw/rgw_op.cc

Simple merge
Simple merge