helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject [3/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Date Tue, 26 Mar 2013 22:07:39 GMT
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/77108e4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/77108e4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/77108e4f

Branch: refs/heads/master
Commit: 77108e4fe351c829143f50ccd138ffcc6ab5a098
Parents: 8b13937 142dab5
Author: slu2011 <lushi04@gmail.com>
Authored: Tue Mar 26 15:05:49 2013 -0700
Committer: slu2011 <lushi04@gmail.com>
Committed: Tue Mar 26 15:05:49 2013 -0700

----------------------------------------------------------------------
 .../helix/webapp/TestClusterManagementWebapp.java  |   29 ++--
 .../src/main/java/org/apache/helix/HelixAdmin.java |   22 ++-
 .../helix/controller/rebalancer/Rebalancer.java    |   54 +++++
 .../helix/controller/stages/ClusterDataCache.java  |   72 ++++++-
 .../controller/stages/MessageThrottleStage.java    |    2 +-
 .../org/apache/helix/manager/zk/ZKHelixAdmin.java  |   77 ++++---
 .../org/apache/helix/model/ClusterConstraints.java |  164 +++++----------
 .../org/apache/helix/model/ConstraintItem.java     |  101 +++++++++
 .../model/builder/ClusterConstraintsBuilder.java   |   73 +++++++
 .../helix/model/builder/ConstraintItemBuilder.java |  111 ++++++++++
 .../stages/TestMessageThrottleStage.java           |    2 +-
 .../helix/integration/TestMessageThrottle.java     |   20 ++-
 .../helix/integration/TestSchedulerMessage.java    |   10 +-
 .../apache/helix/manager/zk/TestZkHelixAdmin.java  |   67 ++++++
 .../org/apache/helix/model/TestConstraint.java     |    1 -
 .../org/apache/helix/tools/TestClusterSetup.java   |   15 +-
 16 files changed, 640 insertions(+), 180 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/77108e4f/helix-core/src/main/java/org/apache/helix/HelixAdmin.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/77108e4f/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
----------------------------------------------------------------------
diff --cc helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
index f0722a4,38da4e7..4e85721
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java
@@@ -46,8 -44,8 +45,9 @@@ import org.apache.helix.HelixAdmin
  import org.apache.helix.HelixConstants;
  import org.apache.helix.HelixDataAccessor;
  import org.apache.helix.HelixException;
 +import org.apache.helix.InstanceType;
  import org.apache.helix.PropertyKey;
+ import org.apache.helix.PropertyKey.Builder;
  import org.apache.helix.PropertyPathConfig;
  import org.apache.helix.PropertyType;
  import org.apache.helix.ZNRecord;

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/77108e4f/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java
----------------------------------------------------------------------


Mime
View raw message