helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zzh...@apache.org
Subject [09/10] git commit: Merge branch 'helix-0.6.2-release' of https://git-wip-us.apache.org/repos/asf/incubator-helix into helix-0.6.2-release
Date Fri, 25 Oct 2013 01:21:22 GMT
Merge branch 'helix-0.6.2-release' of https://git-wip-us.apache.org/repos/asf/incubator-helix
into helix-0.6.2-release

Conflicts:
	helix-admin-webapp/src/test/java/org/apache/helix/tools/TestHelixAdminScenariosRest.java
	helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java


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

Branch: refs/heads/helix-0.6.2-release
Commit: a416e74463a03ea072b36409b39cc1693f6d93af
Parents: 579baa5 610b28b
Author: zzhang <zzhang@apache.org>
Authored: Thu Oct 24 15:54:31 2013 -0700
Committer: zzhang <zzhang@apache.org>
Committed: Thu Oct 24 15:54:31 2013 -0700

----------------------------------------------------------------------
 helix-admin-webapp/pom.xml                      |   4 +-
 .../helix/webapp/RestAdminApplication.java      |  18 +-
 .../resources/ClusterRepresentationUtil.java    |   2 +-
 .../helix/webapp/resources/ClusterResource.java |  54 ++--
 .../webapp/resources/ClustersResource.java      |  41 +--
 .../helix/webapp/resources/ConfigResource.java  |  32 +-
 .../webapp/resources/ConstraintResource.java    |  28 +-
 .../webapp/resources/ControllerResource.java    |  45 +--
 .../ControllerStatusUpdateResource.java         |  39 +--
 .../webapp/resources/CurrentStateResource.java  |  39 +--
 .../webapp/resources/CurrentStatesResource.java |  35 +--
 .../helix/webapp/resources/ErrorResource.java   |  39 +--
 .../helix/webapp/resources/ErrorsResource.java  |  36 +--
 .../webapp/resources/ExternalViewResource.java  |  39 +--
 .../webapp/resources/IdealStateResource.java    |  44 +--
 .../webapp/resources/InstanceResource.java      |  45 +--
 .../webapp/resources/InstancesResource.java     |  42 +--
 .../helix/webapp/resources/JsonParameters.java  |   2 +-
 .../webapp/resources/ResourceGroupResource.java |  45 +--
 .../resources/ResourceGroupsResource.java       |  42 +--
 .../resources/SchedulerTasksResource.java       |  42 +--
 .../webapp/resources/StateModelResource.java    |  44 +--
 .../webapp/resources/StateModelsResource.java   |  43 +--
 .../webapp/resources/StatusUpdateResource.java  |  39 +--
 .../webapp/resources/StatusUpdatesResource.java |  39 +--
 .../helix/webapp/resources/ZkChildResource.java |  42 +--
 .../helix/webapp/resources/ZkPathResource.java  |  47 +--
 .../tools/TestHelixAdminScenariosRest.java      |   8 +-
 .../webapp/TestClusterManagementWebapp.java     |   8 +-
 helix-agent/pom.xml                             |   4 +-
 helix-core/pom.xml                              |  12 +-
 .../controller/rebalancer/AutoRebalancer.java   |  34 +-
 .../controller/rebalancer/CustomRebalancer.java |   9 +-
 .../helix/controller/rebalancer/Rebalancer.java |  14 -
 .../rebalancer/SemiAutoRebalancer.java          |   9 +-
 .../rebalancer/internal/MappingCalculator.java  |  46 +++
 .../restlet/ZKPropertyTransferServer.java       |   5 +
 .../restlet/ZNRecordUpdateResource.java         |  99 +++---
 .../restlet/ZkPropertyTransferApplication.java  |   4 +-
 .../restlet/ZkPropertyTransferClient.java       |   9 +-
 .../stages/BestPossibleStateCalcStage.java      |  26 +-
 .../controller/stages/ResourceAssignment.java   |  58 ++++
 .../controller/stages/ResourceMapping.java      |  58 ----
 .../apache/helix/manager/zk/ZKHelixAdmin.java   |   8 +-
 .../helix/manager/zk/ZKHelixDataAccessor.java   |  18 +-
 .../manager/zk/ZNRecordStreamingSerializer.java |   2 +-
 .../java/org/apache/helix/model/IdealState.java |  21 ++
 .../helix/model/StateModelDefinition.java       |  23 +-
 .../util/StateModelDefinitionValidator.java     | 290 +++++++++++++++++
 .../test/java/org/apache/helix/TestHelper.java  |   2 +-
 .../TestCustomizedIdealStateRebalancer.java     |   6 +-
 .../integration/TestFullAutoNodeTagging.java    | 314 +++++++++++++++++++
 .../helix/model/TestStateModelValidity.java     | 252 +++++++++++++++
 pom.xml                                         |   6 +-
 src/site/markdown/tutorial_state.md             |  79 ++++-
 55 files changed, 1483 insertions(+), 908 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/a416e744/helix-admin-webapp/src/test/java/org/apache/helix/tools/TestHelixAdminScenariosRest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/a416e744/helix-core/src/test/java/org/apache/helix/TestHelper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/a416e744/helix-core/src/test/java/org/apache/helix/integration/TestCustomizedIdealStateRebalancer.java
----------------------------------------------------------------------


Mime
View raw message