Merge pull request #8313 from SUSE/wip-15257-hammer

author Nathan Cutler <presnypreklad@gmail.com>

Fri, 29 Jul 2016 07:14:39 +0000 (09:14 +0200)

committer GitHub <noreply@github.com>

Fri, 29 Jul 2016 07:14:39 +0000 (09:14 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Fri, 29 Jul 2016 07:14:39 +0000 (09:14 +0200)
committer GitHub <noreply@github.com>
Fri, 29 Jul 2016 07:14:39 +0000 (09:14 +0200)
diff --cc src/rgw/rgw_bucket.cc
Simple merge
diff --cc src/rgw/rgw_user.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Fri, 29 Jul 2016 07:14:39 +0000 (09:14 +0200)
committer	GitHub <noreply@github.com>
	Fri, 29 Jul 2016 07:14:39 +0000 (09:14 +0200)
		1	2
src/rgw/rgw_bucket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_user.cc	patch \|	diff1 \|	diff2 \|	blob \| history