Merge pull request #15457 from smithfarm/wip-20018-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Sat, 26 Aug 2017 17:38:29 +0000 (19:38 +0200)

committer GitHub <noreply@github.com>

Sat, 26 Aug 2017 17:38:29 +0000 (19:38 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Sat, 26 Aug 2017 17:38:29 +0000 (19:38 +0200)
committer GitHub <noreply@github.com>
Sat, 26 Aug 2017 17:38:29 +0000 (19:38 +0200)
diff --cc src/rgw/rgw_data_sync.cc
Simple merge
diff --cc src/rgw/rgw_rest_conn.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Sat, 26 Aug 2017 17:38:29 +0000 (19:38 +0200)
committer	GitHub <noreply@github.com>
	Sat, 26 Aug 2017 17:38:29 +0000 (19:38 +0200)
		1	2
src/rgw/rgw_data_sync.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_conn.cc	patch \|	diff1 \|	diff2 \|	blob \| history