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

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

author	Josh Durgin <josh.durgin@inktank.com>
	Thu, 16 Oct 2014 21:33:42 +0000 (14:33 -0700)
committer	Josh Durgin <josh.durgin@inktank.com>
	Thu, 16 Oct 2014 21:33:42 +0000 (14:33 -0700)
commit	a9f302da08ab96128b28d85e2f566ad0f2ba2f30
tree	0996a4b52f5674aca56d79a664f17747932e7f5f	tree \| snapshot
parent	0bb51db92f11a98da1f38a604a35a2e39948ccb1	commit \| diff
parent	95ee69989129750fddce6a3b5644238c4b88ed74	commit \| diff

Merge remote-tracking branch 'origin/wip-rbd-readahead'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Conflicts:
src/client/Fh.h

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