Merge pull request #9931 from Yan-waller/yj-wip-rgwmainccfix

author Matt Benjamin <mbenjamin@redhat.com>

Thu, 30 Jun 2016 20:12:02 +0000 (16:12 -0400)

committer GitHub <noreply@github.com>

Thu, 30 Jun 2016 20:12:02 +0000 (16:12 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Thu, 30 Jun 2016 20:12:02 +0000 (16:12 -0400)
committer GitHub <noreply@github.com>
Thu, 30 Jun 2016 20:12:02 +0000 (16:12 -0400)
diff --cc src/rgw/rgw_main.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Thu, 30 Jun 2016 20:12:02 +0000 (16:12 -0400)
committer	GitHub <noreply@github.com>
	Thu, 30 Jun 2016 20:12:02 +0000 (16:12 -0400)
		1	2
src/rgw/rgw_main.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history