Merge pull request #15507 from zhangsw/fix-rgw-logtrim-bug

author Yehuda Sadeh <yehuda@redhat.com>

Thu, 8 Jun 2017 18:26:44 +0000 (11:26 -0700)

committer GitHub <noreply@github.com>

Thu, 8 Jun 2017 18:26:44 +0000 (11:26 -0700)
author Yehuda Sadeh <yehuda@redhat.com>
Thu, 8 Jun 2017 18:26:44 +0000 (11:26 -0700)
committer GitHub <noreply@github.com>
Thu, 8 Jun 2017 18:26:44 +0000 (11:26 -0700)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_bucket.cc
Simple merge
diff --cc src/rgw/rgw_metadata.cc
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Thu, 8 Jun 2017 18:26:44 +0000 (11:26 -0700)
committer	GitHub <noreply@github.com>
	Thu, 8 Jun 2017 18:26:44 +0000 (11:26 -0700)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_metadata.cc	patch \|	diff1 \|	diff2 \|	blob \| history