]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'unstable' of ssh://ceph.newdream.net/home/sage/ceph.newdream.net/git...
authorSage Weil <sage@newdream.net>
Thu, 17 Jun 2010 17:04:20 +0000 (10:04 -0700)
committerSage Weil <sage@newdream.net>
Thu, 17 Jun 2010 17:04:20 +0000 (10:04 -0700)
1  2 
src/mkcephfs.in

diff --cc src/mkcephfs.in
Simple merge