Merge pull request #18335 from linuxbox2/wip-rgw-readdir2

author Casey Bodley <cbodley@users.noreply.github.com>

Fri, 20 Oct 2017 15:55:17 +0000 (11:55 -0400)

committer GitHub <noreply@github.com>

Fri, 20 Oct 2017 15:55:17 +0000 (11:55 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Fri, 20 Oct 2017 15:55:17 +0000 (11:55 -0400)
committer GitHub <noreply@github.com>
Fri, 20 Oct 2017 15:55:17 +0000 (11:55 -0400)
diff --cc src/rgw/rgw_file.cc
Simple merge
diff --cc src/test/CMakeLists.txt
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Fri, 20 Oct 2017 15:55:17 +0000 (11:55 -0400)
committer	GitHub <noreply@github.com>
	Fri, 20 Oct 2017 15:55:17 +0000 (11:55 -0400)
		1	2
src/rgw/rgw_file.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history