Merge remote-tracking branch 'origin/next'

author John Spray <john.spray@redhat.com>

Thu, 13 Aug 2015 10:00:50 +0000 (11:00 +0100)

committer John Spray <john.spray@redhat.com>

Thu, 13 Aug 2015 10:00:50 +0000 (11:00 +0100)
author John Spray <john.spray@redhat.com>
Thu, 13 Aug 2015 10:00:50 +0000 (11:00 +0100)
committer John Spray <john.spray@redhat.com>
Thu, 13 Aug 2015 10:00:50 +0000 (11:00 +0100)
diff --cc src/common/WorkQueue.h
Simple merge
diff --cc src/mds/Server.cc
Simple merge
diff --cc src/mds/Server.h
Simple merge
author	John Spray <john.spray@redhat.com>
	Thu, 13 Aug 2015 10:00:50 +0000 (11:00 +0100)
committer	John Spray <john.spray@redhat.com>
	Thu, 13 Aug 2015 10:00:50 +0000 (11:00 +0100)
		1	2
src/common/WorkQueue.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.h	patch \|	diff1 \|	diff2 \|	blob \| history