]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge commit '1e8073b75ad5172a1ef975e7c6c42406888f56ae' v0.7.1
authorSage Weil <sage@newdream.net>
Mon, 16 Mar 2009 17:57:23 +0000 (10:57 -0700)
committerSage Weil <sage@newdream.net>
Mon, 16 Mar 2009 17:57:23 +0000 (10:57 -0700)
Conflicts:

src/init-ceph
src/mkcephfs


Trivial merge