Merge pull request #14299 from rzarzynski/wip-rgw-deduplicate-rgw_make_bucket_entry_name

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

Wed, 26 Apr 2017 15:38:13 +0000 (11:38 -0400)

committer GitHub <noreply@github.com>

Wed, 26 Apr 2017 15:38:13 +0000 (11:38 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Wed, 26 Apr 2017 15:38:13 +0000 (11:38 -0400)
committer GitHub <noreply@github.com>
Wed, 26 Apr 2017 15:38:13 +0000 (11:38 -0400)
diff --cc src/rgw/rgw_bucket.cc
Simple merge
diff --cc src/rgw/rgw_bucket.h
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Wed, 26 Apr 2017 15:38:13 +0000 (11:38 -0400)
committer	GitHub <noreply@github.com>
	Wed, 26 Apr 2017 15:38:13 +0000 (11:38 -0400)
		1	2
src/rgw/rgw_bucket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.h	patch \|	diff1 \|	diff2 \|	blob \| history