]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Mon, 14 Mar 2011 23:44:31 +0000 (16:44 -0700)
committerSage Weil <sage@newdream.net>
Mon, 14 Mar 2011 23:44:31 +0000 (16:44 -0700)
commit723a92657b97b41912c5a1c1fedfb08659c6d649
tree8e872c9c0775ac867db85ee239efa2676f548e67
parentdf8c00945f8ddb0553b74fe169af70b4e2d202b2
parent7f4a161e7fd1bb0d0eab3958b427a3c4c585bc05
Merge branch 'stable'

Conflicts:
configure.ac
debian/changelog
src/cfuse.cc
src/rgw/rgw_rest.cc
debian/changelog
src/include/rados/librados.hpp
src/librbd.cc
src/rados.cc