Merge pull request #13149 from liewegas/wip-list-objects

author Sage Weil <sage@newdream.net>

Tue, 14 Feb 2017 04:20:20 +0000 (22:20 -0600)

committer GitHub <noreply@github.com>

Tue, 14 Feb 2017 04:20:20 +0000 (22:20 -0600)
author Sage Weil <sage@newdream.net>
Tue, 14 Feb 2017 04:20:20 +0000 (22:20 -0600)
committer GitHub <noreply@github.com>
Tue, 14 Feb 2017 04:20:20 +0000 (22:20 -0600)
diff --cc src/librados/librados.cc
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 14 Feb 2017 04:20:20 +0000 (22:20 -0600)
committer	GitHub <noreply@github.com>
	Tue, 14 Feb 2017 04:20:20 +0000 (22:20 -0600)
		1	2
src/librados/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history