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

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

author	Samuel Just <samuel.just@dreamhost.com>
	Fri, 23 Dec 2011 01:41:40 +0000 (17:41 -0800)
committer	Samuel Just <samuel.just@dreamhost.com>
	Fri, 23 Dec 2011 01:41:40 +0000 (17:41 -0800)
commit	eb37637f7363f00080390354d00f6fa42203ba29
tree	ade28ee247b7f53901abda8926f1e17707e459c6	tree \| snapshot
parent	1f02e34cb50bf808d92a86cde80ea009a4cce9ca	commit \| diff
parent	855e93b6dea500a4f9c2e6c291dd1641caf007a5	commit \| diff

Merge remote branch 'upstream/master' into wip-backfill

Conflicts:
src/include/object.h

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

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