git.apps.os.sepia.ceph.com Git - ceph.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f976bbd 57d79aa)

author	Sage Weil <sage@newdream.net>
	Thu, 17 Jun 2010 17:04:20 +0000 (10:04 -0700)
committer	Sage Weil <sage@newdream.net>
	Thu, 17 Jun 2010 17:04:20 +0000 (10:04 -0700)
commit	f6501564a9f0cddd9be96e1fa5feba9e897139f3
tree	a78bb29974a5cfb30fc5a686bcdeece124810400	tree \| snapshot
parent	f976bbdcf700e52c9ef92964551b2c73b014686c	commit \| diff
parent	57d79aaa5f20d56e34e8a58601cf90ad5429f591	commit \| diff

Merge branch 'unstable' of ssh://ceph.newdream.net/home/sage/ceph.newdream.net/git/ceph into unstable

src/mkcephfs.in

Unnamed repository; edit this file 'description' to name the repository.