Merge pull request #13622 from zhangsw/feature-lifecycle-multipart

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

Thu, 6 Apr 2017 14:02:29 +0000 (10:02 -0400)

committer GitHub <noreply@github.com>

Thu, 6 Apr 2017 14:02:29 +0000 (10:02 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Thu, 6 Apr 2017 14:02:29 +0000 (10:02 -0400)
committer GitHub <noreply@github.com>
Thu, 6 Apr 2017 14:02:29 +0000 (10:02 -0400)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Thu, 6 Apr 2017 14:02:29 +0000 (10:02 -0400)
committer	GitHub <noreply@github.com>
	Thu, 6 Apr 2017 14:02:29 +0000 (10:02 -0400)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	patch \|	diff1 \|	diff2 \|	blob \| history