]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorSage Weil <sage.weil@dreamhost.com>
Mon, 28 Feb 2011 19:19:37 +0000 (11:19 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Mon, 28 Feb 2011 19:19:37 +0000 (11:19 -0800)
Conflicts:
src/pybind/rados.py

1  2 
src/osd/OSD.cc
src/pybind/rados.py

diff --cc src/osd/OSD.cc
Simple merge
Simple merge