Merge pull request #9080 from martinfurmanski/3.2-policy-key-rename

policy key rename
neo4j · Mar 23, 2017 · 990158c · 990158c
2 parents f0d5a61 + 9ce04b1
commit 990158c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/Policies.java b/...main/java/org/neo4j/causalclustering/load_balancing/plugins/server_policies/Policies.java
@@ -31,7 +31,7 @@
 
 public class Policies
 {
-    public static final String POLICY_KEY = "load_balancing.policy"; // TODO: move somewhere (driver support package?)
+    public static final String POLICY_KEY = "policy";
     static final String DEFAULT_POLICY_NAME = "default";
     static final Policy DEFAULT_POLICY = new FilteringPolicy( IdentityFilter.as() ); // the default default
 

diff --git a/...eo4j-harness-enterprise/src/main/java/org/neo4j/harness/CausalClusterInProcessRunner.java b/...eo4j-harness-enterprise/src/main/java/org/neo4j/harness/CausalClusterInProcessRunner.java
@@ -121,6 +121,7 @@ void boot() throws IOException, InterruptedException
                 builder.withConfig( GraphDatabaseSettings.pagecache_memory.name(), "8m" );
 
                 builder.withConfig( ClusterSettings.mode.name(), ClusterSettings.Mode.CORE.name() );
+                builder.withConfig( CausalClusteringSettings.multi_dc_license.name(), "true" );
                 builder.withConfig( CausalClusteringSettings.initial_discovery_members.name(), String.join( ",", initialMembers ) );
 
                 builder.withConfig( CausalClusteringSettings.discovery_listen_address.name(), specifyPortOnly( hazelcastPort ) );