Merge pull request #12674 from Liuchang0812/tools-rados-offset-support

author Sage Weil <sage@redhat.com>

Tue, 27 Dec 2016 22:35:50 +0000 (16:35 -0600)

committer GitHub <noreply@github.com>

Tue, 27 Dec 2016 22:35:50 +0000 (16:35 -0600)
author Sage Weil <sage@redhat.com>
Tue, 27 Dec 2016 22:35:50 +0000 (16:35 -0600)
committer GitHub <noreply@github.com>
Tue, 27 Dec 2016 22:35:50 +0000 (16:35 -0600)
diff --cc qa/workunits/rados/test_rados_tool.sh
Simple merge
diff --cc src/tools/rados/rados.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 27 Dec 2016 22:35:50 +0000 (16:35 -0600)
committer	GitHub <noreply@github.com>
	Tue, 27 Dec 2016 22:35:50 +0000 (16:35 -0600)
		1	2
qa/workunits/rados/test_rados_tool.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rados/rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history