Merge pull request #10940 from stiopaa1/mds_beacon_moveCMDSBeaconSenderClass

author John Spray <jspray@redhat.com>

Tue, 15 Nov 2016 21:37:31 +0000 (21:37 +0000)

committer GitHub <noreply@github.com>

Tue, 15 Nov 2016 21:37:31 +0000 (21:37 +0000)
author John Spray <jspray@redhat.com>
Tue, 15 Nov 2016 21:37:31 +0000 (21:37 +0000)
committer GitHub <noreply@github.com>
Tue, 15 Nov 2016 21:37:31 +0000 (21:37 +0000)
diff --cc src/mds/Beacon.cc
Simple merge
diff --cc src/mds/Beacon.h
Simple merge
author	John Spray <jspray@redhat.com>
	Tue, 15 Nov 2016 21:37:31 +0000 (21:37 +0000)
committer	GitHub <noreply@github.com>
	Tue, 15 Nov 2016 21:37:31 +0000 (21:37 +0000)
		1	2
src/mds/Beacon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Beacon.h	patch \|	diff1 \|	diff2 \|	blob \| history