Merge pull request #3513 from rzarzynski/wip-10425

author Samuel Just <sam.just@inktank.com>

Thu, 12 Feb 2015 01:29:41 +0000 (17:29 -0800)

committer Samuel Just <sam.just@inktank.com>

Thu, 12 Feb 2015 01:29:41 +0000 (17:29 -0800)
author Samuel Just <sam.just@inktank.com>
Thu, 12 Feb 2015 01:29:41 +0000 (17:29 -0800)
committer Samuel Just <sam.just@inktank.com>
Thu, 12 Feb 2015 01:29:41 +0000 (17:29 -0800)
diff --cc src/librados/RadosClient.cc
Simple merge
diff --cc src/test/librados/misc.cc
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Thu, 12 Feb 2015 01:29:41 +0000 (17:29 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Thu, 12 Feb 2015 01:29:41 +0000 (17:29 -0800)
		1	2
src/librados/RadosClient.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/librados/misc.cc	patch \|	diff1 \|	diff2 \|	blob \| history