Merge pull request #11710 from ceph/wip-jlayton-fsync

author John Spray <jspray@redhat.com>

Fri, 11 Nov 2016 14:29:15 +0000 (15:29 +0100)

committer GitHub <noreply@github.com>

Fri, 11 Nov 2016 14:29:15 +0000 (15:29 +0100)
author John Spray <jspray@redhat.com>
Fri, 11 Nov 2016 14:29:15 +0000 (15:29 +0100)
committer GitHub <noreply@github.com>
Fri, 11 Nov 2016 14:29:15 +0000 (15:29 +0100)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/messages/MClientCaps.h
Simple merge
author	John Spray <jspray@redhat.com>
	Fri, 11 Nov 2016 14:29:15 +0000 (15:29 +0100)
committer	GitHub <noreply@github.com>
	Fri, 11 Nov 2016 14:29:15 +0000 (15:29 +0100)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/messages/MClientCaps.h	patch \|	diff1 \|	diff2 \|	blob \| history