Merge pull request #1606 from ceph/wip-shrink-icache

author Sage Weil <sage@inktank.com>

Wed, 9 Apr 2014 13:55:33 +0000 (06:55 -0700)

committer Sage Weil <sage@inktank.com>

Wed, 9 Apr 2014 13:55:33 +0000 (06:55 -0700)
author Sage Weil <sage@inktank.com>
Wed, 9 Apr 2014 13:55:33 +0000 (06:55 -0700)
committer Sage Weil <sage@inktank.com>
Wed, 9 Apr 2014 13:55:33 +0000 (06:55 -0700)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Wed, 9 Apr 2014 13:55:33 +0000 (06:55 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 9 Apr 2014 13:55:33 +0000 (06:55 -0700)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.h	patch \|	diff1 \|	diff2 \|	blob \| history