Merge "Bug-2692:Avoid fake snapshot during initiate snapshot"

author Tom Pantelis <tpanteli@brocade.com>

Tue, 10 Feb 2015 18:22:52 +0000 (18:22 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Tue, 10 Feb 2015 18:22:52 +0000 (18:22 +0000)
author Tom Pantelis <tpanteli@brocade.com>
Tue, 10 Feb 2015 18:22:52 +0000 (18:22 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Tue, 10 Feb 2015 18:22:52 +0000 (18:22 +0000)
diff --cc opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
Simple merge
diff --cc opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java
Simple merge
author	Tom Pantelis <tpanteli@brocade.com>
	Tue, 10 Feb 2015 18:22:52 +0000 (18:22 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Tue, 10 Feb 2015 18:22:52 +0000 (18:22 +0000)
		1	2
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java	patch \|	diff1 \|	diff2 \|	blob \| history
opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java	patch \|	diff1 \|	diff2 \|	blob \| history