You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2013/12/03 00:05:10 UTC
[1/2] git commit: [HELIX-320] Remove merge conflicts from comments in
files
Updated Branches:
refs/heads/master 2904c8369 -> 7521c0cb5
[HELIX-320] Remove merge conflicts from comments in files
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/a39fa848
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/a39fa848
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/a39fa848
Branch: refs/heads/master
Commit: a39fa848c2534eb5cdde6a590b83766e9d22daaa
Parents: d09de23
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Wed Nov 20 12:51:55 2013 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Wed Nov 20 12:51:55 2013 -0800
----------------------------------------------------------------------
.../java/org/apache/helix/api/config/ParticipantConfig.java | 6 ------
.../helix/controller/strategy/ShufflingTwoStateStrategy.java | 7 -------
2 files changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/a39fa848/helix-core/src/main/java/org/apache/helix/api/config/ParticipantConfig.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/api/config/ParticipantConfig.java b/helix-core/src/main/java/org/apache/helix/api/config/ParticipantConfig.java
index 1d7b23e..119ff52 100644
--- a/helix-core/src/main/java/org/apache/helix/api/config/ParticipantConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/api/config/ParticipantConfig.java
@@ -176,14 +176,8 @@ public class ParticipantConfig {
}
/**
- * <<<<<<< HEAD:helix-core/src/main/java/org/apache/helix/api/config/ParticipantConfig.java
* Set the enabled status of the participant
* @param isEnabled true if enabled, false if disabled
- * =======
- * Set whether or not the participant is enabled
- * @param isEnabled true if enabled, false otherwise
- * >>>>>>> helix-logical-model:helix-core/src/main/java/org/apache/helix/api/
- * ParticipantConfig.java
* @return Delta
*/
public Delta setEnabled(boolean isEnabled) {
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/a39fa848/helix-core/src/main/java/org/apache/helix/controller/strategy/ShufflingTwoStateStrategy.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/controller/strategy/ShufflingTwoStateStrategy.java b/helix-core/src/main/java/org/apache/helix/controller/strategy/ShufflingTwoStateStrategy.java
index 7b4ce73..04cc40d 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/strategy/ShufflingTwoStateStrategy.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/strategy/ShufflingTwoStateStrategy.java
@@ -48,14 +48,7 @@ public class ShufflingTwoStateStrategy {
* the partitions array 3. Scan the shuffled array, then assign
* partitionList[i] to node (i % nodes)
* for the slave partitions, simply put them in the node after the node that
- * <<<<<<<
- * HEAD:helix-core/src/main/java/org/apache/helix/controller/strategy/ShufflingTwoStateStrategy
- * .java
- * contains the primary partition.
- * =======
* contains the master partition.
- * >>>>>>>
- * master:helix-core/src/main/java/org/apache/helix/tools/IdealStateCalculatorByShuffling.java
* The result of the method is a ZNRecord, which contains a list of maps; each
* map is from the name of nodes to either state name ("MASTER" or "SLAVE" for
* MasterSlave).
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-helix
Posted by ka...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/7521c0cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/7521c0cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/7521c0cb
Branch: refs/heads/master
Commit: 7521c0cb598bc8e2c722ad750584808e787f3cbb
Parents: a39fa84 2904c83
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Wed Nov 27 14:15:39 2013 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Wed Nov 27 14:15:39 2013 -0800
----------------------------------------------------------------------
.../manager/zk/HelixConnectionAdaptor.java | 4 +-
.../src/site/xdoc/download.xml.vm | 30 ++-
.../src/site/markdown/Tutorial.md | 26 ++-
.../src/site/xdoc/download.xml.vm | 40 +++-
src/site/apt/releasing.apt | 194 +++++++++++++++++--
src/site/markdown/index.md | 2 +-
src/site/site.xml | 16 +-
src/site/xdoc/download.xml.vm | 40 +++-
8 files changed, 282 insertions(+), 70 deletions(-)
----------------------------------------------------------------------