You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ca...@apache.org on 2016/12/05 02:05:28 UTC
[2/2] curator git commit: Merge branch 'master' into CURATOR-3.0
Merge branch 'master' into CURATOR-3.0
Conflicts:
curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/e6ed9996
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/e6ed9996
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/e6ed9996
Branch: refs/heads/CURATOR-3.0
Commit: e6ed99965b6df91607b2505a3784780e51fa8c53
Parents: 60d24c2 0a0a1e7
Author: Cam McKenzie <ca...@apache.org>
Authored: Mon Dec 5 13:05:07 2016 +1100
Committer: Cam McKenzie <ca...@apache.org>
Committed: Mon Dec 5 13:05:07 2016 +1100
----------------------------------------------------------------------
.../org/apache/curator/test/InstanceSpec.java | 34 +++++++++++++++++---
.../curator/test/QuorumConfigBuilder.java | 2 +-
2 files changed, 30 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/e6ed9996/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
----------------------------------------------------------------------
diff --cc curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
index 0a71161,bc0272c..d04e09f
--- a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
+++ b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
@@@ -72,11 -72,8 +72,12 @@@ public class InstanceSpe
private final int tickTime;
private final int maxClientCnxns;
private final Map<String,Object> customProperties;
+ private final String hostname;
+ public static void reset() {
+ nextServerId.set(1);
+ }
+
public static InstanceSpec newInstanceSpec()
{
return new InstanceSpec(null, -1, -1, -1, true, -1, -1, -1);
http://git-wip-us.apache.org/repos/asf/curator/blob/e6ed9996/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
----------------------------------------------------------------------
diff --cc curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
index 5baf5ce,fb4039d..d385103
--- a/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
+++ b/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
@@@ -124,7 -100,7 +124,7 @@@ public class QuorumConfigBuilder implem
{
for ( InstanceSpec thisSpec : instanceSpecs )
{
- properties.setProperty("server." + thisSpec.getServerId(), String.format("localhost:%d:%d;localhost:%d", thisSpec.getQuorumPort(), thisSpec.getElectionPort(), thisSpec.getPort()));
- properties.setProperty("server." + thisSpec.getServerId(), String.format("%s:%d:%d", thisSpec.getHostname(), thisSpec.getQuorumPort(), thisSpec.getElectionPort()));
++ properties.setProperty("server." + thisSpec.getServerId(), String.format("%s:%d:%d;%s:%d", thisSpec.getHostname(), thisSpec.getQuorumPort(), thisSpec.getElectionPort(), thisSpec.getHostname(), thisSpec.getPort()));
}
}
Map<String,Object> customProperties = spec.getCustomProperties();