]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commita2ffef9d40f372edd2969f5039b9d68153b9aa6e
tree92060148621a0030b6f535ba61a252df788bc070
parent040e54608209aaf7ea1379bf694728bc32dd577a
parente7f2972d127ff6e718b0dae4cbba561f6dd142dd
Merge branch 'next'

Conflicts:
src/pybind/rados.py
src/osd/OSD.cc
src/pybind/rados.py