git-server-git.apps.pok.os.sepia.ceph.com Git

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

author	David Zafman <david.zafman@inktank.com>
	Tue, 9 Jul 2013 21:10:42 +0000 (14:10 -0700)
committer	David Zafman <david.zafman@inktank.com>
	Tue, 9 Jul 2013 21:10:42 +0000 (14:10 -0700)
commit	b10848e212d9469e0c1663ace59d3cf15525ca01
tree	430ec0e947ec85aa88d7cd823e9c3a9843227a5d	tree \| snapshot
parent	c4870143c9edf9d8c7f57fc54fd0edb3d41ece4b	commit \| diff
parent	f1b4398dd2cef746a69e22b8aa23a9cb7f4afbef	commit \| diff

Merge branch 'master' into wip-4982-4983-oloc-rebase

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