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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 52c2182 1417ede)

author	Sage Weil <sage@redhat.com>
	Fri, 1 Aug 2014 22:37:33 +0000 (15:37 -0700)
committer	Sage Weil <sage@redhat.com>
	Fri, 1 Aug 2014 22:37:33 +0000 (15:37 -0700)
commit	79d1aff1821bc9f21477636df4d0d4e57f2cd008
tree	a48195b782ee1a28f960be7b38bfe866e9c7a461	tree \| snapshot
parent	52c2182fe833e8a0206787ecd878bd010cc2e529	commit \| diff
parent	1417eded65f40bdb2a49c8252fcfffa383a7b965	commit \| diff

Merge branch 'wip-cache-second'

Reviewed-by: Samuel Just <sam.just@inktank.com>

src/common/config_opts.h	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	diff1 \|	diff2 \|	blob \| history

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