Merge pull request #6244 from majianpeng/filestore-xattr

author Sage Weil <sage@redhat.com>

Sun, 25 Oct 2015 16:06:43 +0000 (12:06 -0400)

committer Sage Weil <sage@redhat.com>

Sun, 25 Oct 2015 16:06:43 +0000 (12:06 -0400)
author Sage Weil <sage@redhat.com>
Sun, 25 Oct 2015 16:06:43 +0000 (12:06 -0400)
committer Sage Weil <sage@redhat.com>
Sun, 25 Oct 2015 16:06:43 +0000 (12:06 -0400)
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/os/chain_xattr.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Sun, 25 Oct 2015 16:06:43 +0000 (12:06 -0400)
committer	Sage Weil <sage@redhat.com>
	Sun, 25 Oct 2015 16:06:43 +0000 (12:06 -0400)
		1	2
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/chain_xattr.h	patch \|	diff1 \|	diff2 \|	blob \| history