Merge pull request #15269 from theanalyst/rgw/env-fix

author Radoslaw Zarzynski <radoslaw.zarzynski@gmail.com>

Wed, 14 Jun 2017 16:11:18 +0000 (18:11 +0200)

committer GitHub <noreply@github.com>

Wed, 14 Jun 2017 16:11:18 +0000 (18:11 +0200)
author Radoslaw Zarzynski <radoslaw.zarzynski@gmail.com>
Wed, 14 Jun 2017 16:11:18 +0000 (18:11 +0200)
committer GitHub <noreply@github.com>
Wed, 14 Jun 2017 16:11:18 +0000 (18:11 +0200)
diff --cc src/rgw/rgw_common.cc
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
author	Radoslaw Zarzynski <radoslaw.zarzynski@gmail.com>
	Wed, 14 Jun 2017 16:11:18 +0000 (18:11 +0200)
committer	GitHub <noreply@github.com>
	Wed, 14 Jun 2017 16:11:18 +0000 (18:11 +0200)
		1	2
src/rgw/rgw_common.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history