Merge pull request #9171 from weiqiaomiao/wqm-wip-rgw-mem

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

Mon, 23 May 2016 20:55:15 +0000 (16:55 -0400)

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

Mon, 23 May 2016 20:55:15 +0000 (16:55 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Mon, 23 May 2016 20:55:15 +0000 (16:55 -0400)
committer Casey Bodley <cbodley@users.noreply.github.com>
Mon, 23 May 2016 20:55:15 +0000 (16:55 -0400)
diff --cc src/rgw/rgw_rest.h
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Mon, 23 May 2016 20:55:15 +0000 (16:55 -0400)
committer	Casey Bodley <cbodley@users.noreply.github.com>
	Mon, 23 May 2016 20:55:15 +0000 (16:55 -0400)
		1	2
src/rgw/rgw_rest.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history