You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by rm...@apache.org on 2013/05/30 06:58:45 UTC

[8/9] git commit: Minor wording edit Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix

Minor wording edit
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix

Conflicts:
	src/site/markdown/Concepts.md


Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/8fe1fa0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/8fe1fa0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/8fe1fa0b

Branch: refs/heads/master
Commit: 8fe1fa0bf78f41d51617a19ddd8f41c3de524be9
Parents: 676533b 0d2bedb
Author: Bob Schulman <bs...@linkedin.com>
Authored: Wed May 29 10:08:54 2013 -0700
Committer: Bob Schulman <bs...@linkedin.com>
Committed: Wed May 29 10:08:54 2013 -0700

----------------------------------------------------------------------
 .../helix/webapp/resources/ZkPathResource.java     |    2 +-
 src/site/apt/releasing.apt                         |   28 ++++++++-------
 src/site/markdown/Concepts.md                      |    2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/8fe1fa0b/src/site/markdown/Concepts.md
----------------------------------------------------------------------
diff --cc src/site/markdown/Concepts.md
index 24f15a3,91e84b5..02d7406
--- a/src/site/markdown/Concepts.md
+++ b/src/site/markdown/Concepts.md
@@@ -253,7 -253,7 +253,7 @@@ The above steps happen for every chang
  
  One of the things that makes Helix powerful is that IdealState can be changed dynamically. This means one can listen to cluster events like node failures and dynamically change the ideal state. Helix will then take care of triggering the respective transitions in the system.
  
- Helix comes with few algorithms to automatically compute the IdealState based on the constraints. For example, if you have a resource of 3 partitions and 2 replicas, Helix can automatically compute the IdealState based on the nodes that are currently active. See the [tutorial](./tutorial_rebalance.hmtl) to find out more about various execution modes of Helix like AUTO_REBALANCE, AUTO and CUSTOM. 
 -Helix comes with few algorithms to automatically compute the IdealState based on the constraints. For example, if you have a resource of 3 partitions and 2 replicas, Helix can automatically compute the IdealState based on the nodes that are currently active. See the [tutorial](./tutorial_rebalance.html) to find out more about various execution modes of Helix like AUTO_REBALANCE, AUTO and CUSTOM. 
++Helix comes with a few algorithms to automatically compute the IdealState based on the constraints. For example, if you have a resource of 3 partitions and 2 replicas, Helix can automatically compute the IdealState based on the nodes that are currently active. See the [tutorial](./tutorial_rebalance.html) to find out more about various execution modes of Helix like AUTO_REBALANCE, AUTO and CUSTOM.