Merge pull request #9510 from renhwztetecs/renhw-wip-common

author Yuri Weinstein <yuri.weinstein@gmail.com>

Thu, 14 Jul 2016 22:15:18 +0000 (15:15 -0700)

committer GitHub <noreply@github.com>

Thu, 14 Jul 2016 22:15:18 +0000 (15:15 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Thu, 14 Jul 2016 22:15:18 +0000 (15:15 -0700)
committer GitHub <noreply@github.com>
Thu, 14 Jul 2016 22:15:18 +0000 (15:15 -0700)
diff --cc src/client/Inode.h
Simple merge
diff --cc src/common/ceph_hash.cc
Simple merge
diff --cc src/mds/CInode.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Thu, 14 Jul 2016 22:15:18 +0000 (15:15 -0700)
committer	GitHub <noreply@github.com>
	Thu, 14 Jul 2016 22:15:18 +0000 (15:15 -0700)
		1	2
src/client/Inode.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/ceph_hash.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/CInode.cc	patch \|	diff1 \|	diff2 \|	blob \| history