tree aa6602c165b32222dbb33f71c3d498f064ee2a05
parent 88b589cc8a3cbacfc764e1629a4bff0622238d4b
author Vinod Kone <vinod@twitter.com> 1376376798 -0700
committer Vinod Kone <vinod@twitter.com> 1376423309 -0700

Revert "Fixed master to send a FrameworkReregistered message when the
framework re-registers with a failed over master."

This reverts commit 68ccbf1d9ab1fee2bef933a27368e5460f9be42e.

Conflicts:
	src/master/master.cpp
	src/tests/fault_tolerance_tests.cpp