Merge "Add more info to ShardStats JXM bean"

author Moiz Raja <moraja@cisco.com>

Tue, 24 Mar 2015 17:03:46 +0000 (17:03 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Tue, 24 Mar 2015 17:03:46 +0000 (17:03 +0000)
author Moiz Raja <moraja@cisco.com>
Tue, 24 Mar 2015 17:03:46 +0000 (17:03 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Tue, 24 Mar 2015 17:03:46 +0000 (17:03 +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-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
Simple merge
diff --cc opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java
Simple merge
author	Moiz Raja <moraja@cisco.com>
	Tue, 24 Mar 2015 17:03:46 +0000 (17:03 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Tue, 24 Mar 2015 17:03:46 +0000 (17:03 +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-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java	patch \|	diff1 \|	diff2 \|	blob \| history
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java	patch \|	diff1 \|	diff2 \|	blob \| history