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 Thu, 18 Apr 2013 23:22:08 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/6e7b44ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/6e7b44ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/6e7b44ed

Branch: refs/heads/master
Commit: 6e7b44ed59f7b60f7ff49b9c5c31e726d45a246e
Parents: 1bc07c2 7e61ccf
Author: slu2011 <lushi04@gmail.com>
Authored: Thu Apr 18 16:21:06 2013 -0700
Committer: slu2011 <lushi04@gmail.com>
Committed: Thu Apr 18 16:21:06 2013 -0700

----------------------------------------------------------------------
 helix-agent/pom.xml                                |    6 +
 .../org/apache/helix/agent/AgentStateModel.java    |   25 +-
 .../java/org/apache/helix/agent/CommandConfig.java |    9 +-
 .../integration-test/config/log4j-info.properties  |   23 +
 .../integration-test/config/log4j.properties       |   25 +
 .../config/zookeeper-log4j2file.properties         |   26 +
 .../integration-test/lib/dds_test_infra.tar.gz     |  Bin 0 -> 69424 bytes
 .../main/scripts/integration-test/log4j.properties |   24 +
 .../scripts/integration-test/script/cm_driver.py   |   71 +
 .../scripts/integration-test/script/dds_driver.py  | 1098 +++++++++
 .../integration-test/script/driver_cmd_dict.py     |  312 +++
 .../scripts/integration-test/script/pexpect.py     | 1864 +++++++++++++++
 .../scripts/integration-test/script/pexpect.pyc    |  Bin 0 -> 67774 bytes
 .../scripts/integration-test/script/utility.py     |  813 +++++++
 .../scripts/integration-test/script/utility.pyc    |  Bin 0 -> 40725 bytes
 .../main/scripts/integration-test/setup_env.inc    |   37 +
 .../scripts/integration-test/testcases/foo_test.py |   38 +
 .../testcases/report_pass_fail.inc                 |   40 +
 .../integration-test/testcases/setup_env.inc       |   60 +
 helix-agent/src/test/conf/testng.xml               |    2 +-
 .../org/apache/helix/agent/TestHelixAgent.java     |  180 ++
 .../helix/examples/IdealStateBuilderExample.java   |  149 ++
 .../helix/model/builder/IdealStateBuilder.java     |    3 +-
 .../java/org/apache/helix/tools/ClusterSetup.java  |    1 -
 24 files changed, 4790 insertions(+), 16 deletions(-)
----------------------------------------------------------------------



Mime
View raw message