]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage@inktank.com>
Tue, 15 May 2012 03:30:35 +0000 (20:30 -0700)
committerSage Weil <sage@inktank.com>
Tue, 15 May 2012 03:30:35 +0000 (20:30 -0700)
Conflicts:
src/osdc/Objecter.cc

1  2 
src/osdc/Objecter.h

Simple merge