From: Moiz Raja <moraja@cisco.com>
Date: Mon, 26 Jan 2015 03:57:54 +0000 (+0000)
Subject: Merge "Bug 2265: Use new NormalizedNode streaming in messages"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=fcf65d723ef53f8da2dd6347f41ce19016fc36e5

Merge "Bug 2265: Use new NormalizedNode streaming in messages"
---

fcf65d723ef53f8da2dd6347f41ce19016fc36e5
diff --cc opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
index f8bcb528b3,1661bb4b5d..a3ef0339b7
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java
@@@ -95,12 -95,9 +95,10 @@@ import scala.concurrent.duration.Finite
   */
  public class Shard extends RaftActor {
  
-     private static final Object COMMIT_TRANSACTION_REPLY = new CommitTransactionReply().toSerializable();
- 
      private static final Object TX_COMMIT_TIMEOUT_CHECK_MESSAGE = "txCommitTimeoutCheck";
  
 -    public static final String DEFAULT_NAME = "default";
 +    @VisibleForTesting
 +    static final String DEFAULT_NAME = "default";
  
      // The state of this Shard
      private final InMemoryDOMDataStore store;