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
(parent: bdb7991) | patch

author	Sage Weil <sage@newdream.net>
	Wed, 22 Jun 2011 15:56:47 +0000 (08:56 -0700)
committer	Sage Weil <sage@newdream.net>
	Wed, 22 Jun 2011 15:56:47 +0000 (08:56 -0700)
commit	1635bff4a9623a42b18837b116b364779a114a7b
tree	7583ba2fb67b33cdbd3912e0578880c271b38295	tree \| snapshot
parent	bdb7991c29b82ba5a85d8c79059a5551d78c0f14	commit \| diff

osd: fix merge

Signed-off-by: Sage Weil <sage@newdream.net>

diff | blob | history

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