You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ka...@apache.org on 2013/12/04 19:19:22 UTC
git commit: [HELIX-327] Simplify rebalancer, rename rebalancer configs,
support settable contexts (fix test)
Updated Branches:
refs/heads/master 015e7dda2 -> 03001d992
[HELIX-327] Simplify rebalancer, rename rebalancer configs, support settable contexts (fix test)
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/03001d99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/03001d99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/03001d99
Branch: refs/heads/master
Commit: 03001d9923ae4679f1510dc7221415d8ca5dd2f8
Parents: 015e7dd
Author: Kanak Biscuitwala <ka...@apache.org>
Authored: Wed Dec 4 10:19:17 2013 -0800
Committer: Kanak Biscuitwala <ka...@apache.org>
Committed: Wed Dec 4 10:19:17 2013 -0800
----------------------------------------------------------------------
helix-agent/.gitignore | 16 ++++++++++++++++
.../java/org/apache/helix/agent/TestHelixAgent.java | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/03001d99/helix-agent/.gitignore
----------------------------------------------------------------------
diff --git a/helix-agent/.gitignore b/helix-agent/.gitignore
new file mode 100644
index 0000000..2411bd8
--- /dev/null
+++ b/helix-agent/.gitignore
@@ -0,0 +1,16 @@
+/target
+/.project
+/.classpath
+/.settings
+/zkdata
+/test-output
+/src/main/scripts/integration-test/var
+#/src/test/java/com/linkedin/dds/
+#/src/main/scripts/integration-test/config
+/src/main/scripts/target/
+/src/main/scripts/integration-test/script/.metadata_infra
+#/src/main/scripts/integration-test/script/dds_driver.py
+#/src/main/scripts/integration-test/script/pexpect.py
+#/src/main/scripts/integration-test/script/utility.py
+*.pyc
+/bin
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/03001d99/helix-agent/src/test/java/org/apache/helix/agent/TestHelixAgent.java
----------------------------------------------------------------------
diff --git a/helix-agent/src/test/java/org/apache/helix/agent/TestHelixAgent.java b/helix-agent/src/test/java/org/apache/helix/agent/TestHelixAgent.java
index 27b4d36..ccf64ce 100644
--- a/helix-agent/src/test/java/org/apache/helix/agent/TestHelixAgent.java
+++ b/helix-agent/src/test/java/org/apache/helix/agent/TestHelixAgent.java
@@ -171,7 +171,7 @@ public class TestHelixAgent extends ZkUnitTestBase {
agentThread.start();
// wait participant thread to start
- Thread.sleep(100);
+ Thread.sleep(1000);
}
boolean result =