git.apps.os.sepia.ceph.com Git

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

author	Yehuda Sadeh <yehuda@hq.newdream.net>
	Thu, 16 Feb 2012 20:34:42 +0000 (12:34 -0800)
committer	Yehuda Sadeh <yehuda@hq.newdream.net>
	Thu, 16 Feb 2012 20:34:42 +0000 (12:34 -0800)
commit	bbdba4688281486018f68fd27c61c06dd39f8873
tree	a941af47d2491f4373723fa4e125d2e16c36cd7e	tree \| snapshot
parent	ba12f26f1bc0fb2f9dc7e68df6e8ef9308031bc3	commit \| diff
parent	4b3bb5ab37a05fa001d59f24da7d9c30d650321b	commit \| diff

Merge branch 'master' of ssh://github.com/NewDreamNetwork/ceph into wip-swift-acls

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