helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix
Date Fri, 29 Mar 2013 00:04:03 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/7c36c7d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/7c36c7d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/7c36c7d9

Branch: refs/heads/master
Commit: 7c36c7d96dfd11e1575de66ece7c036ab382d2f0
Parents: 4ab2d03 da01293
Author: slu2011 <lushi04@gmail.com>
Authored: Thu Mar 28 17:03:53 2013 -0700
Committer: slu2011 <lushi04@gmail.com>
Committed: Thu Mar 28 17:03:53 2013 -0700

----------------------------------------------------------------------
 .../apache/helix/webapp/RestAdminApplication.java  |    3 +
 .../helix/webapp/resources/ConstraintResource.java |  158 +++++++++
 .../helix/webapp/resources/JsonParameters.java     |   42 ++-
 .../src/main/java/org/apache/helix/HelixAdmin.java |   25 +-
 .../helix/manager/zk/CurStateCarryOverUpdater.java |   72 ++++
 .../org/apache/helix/manager/zk/ZKHelixAdmin.java  |   21 +-
 .../apache/helix/manager/zk/ZKHelixManager.java    |   89 +++---
 .../java/org/apache/helix/tools/ClusterSetup.java  |  274 +++++++++++----
 .../main/java/org/apache/helix/util/HelixUtil.java |   33 ++
 .../integration/TestCarryOverBadCurState.java      |    1 +
 .../helix/integration/TestMessageThrottle.java     |    2 +-
 .../helix/integration/TestSchedulerMessage.java    |   19 +-
 .../apache/helix/manager/zk/TestZkHelixAdmin.java  |   10 +-
 .../org/apache/helix/tools/TestClusterSetup.java   |    8 +-
 14 files changed, 584 insertions(+), 173 deletions(-)
----------------------------------------------------------------------



Mime
View raw message