Merge pull request #8618 from linuxbox2/rgw-file-setattr

author Orit Wasserman <owasserm@redhat.com>

Thu, 14 Jul 2016 13:16:03 +0000 (15:16 +0200)

committer GitHub <noreply@github.com>

Thu, 14 Jul 2016 13:16:03 +0000 (15:16 +0200)
author Orit Wasserman <owasserm@redhat.com>
Thu, 14 Jul 2016 13:16:03 +0000 (15:16 +0200)
committer GitHub <noreply@github.com>
Thu, 14 Jul 2016 13:16:03 +0000 (15:16 +0200)
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_file.cc
Simple merge
diff --cc src/rgw/rgw_file.h
Simple merge
author	Orit Wasserman <owasserm@redhat.com>
	Thu, 14 Jul 2016 13:16:03 +0000 (15:16 +0200)
committer	GitHub <noreply@github.com>
	Thu, 14 Jul 2016 13:16:03 +0000 (15:16 +0200)
		1	2
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_file.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_file.h	patch \|	diff1 \|	diff2 \|	blob \| history