You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by zz...@apache.org on 2013/11/16 01:37:18 UTC
git commit: [HELIX-264] fix zkclient#close() bug,
port fix to 0.6.1.5-release, add missing license headers, rb=15603
Updated Branches:
refs/heads/helix-0.6.1.5-release 58a7887e5 -> 4f7242717
[HELIX-264] fix zkclient#close() bug, port fix to 0.6.1.5-release, add missing license headers, rb=15603
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/4f724271
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/4f724271
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/4f724271
Branch: refs/heads/helix-0.6.1.5-release
Commit: 4f72427177e5476742002031aceda1f900d4b396
Parents: 58a7887
Author: zzhang <zz...@apache.org>
Authored: Fri Nov 15 16:37:00 2013 -0800
Committer: zzhang <zz...@apache.org>
Committed: Fri Nov 15 16:37:00 2013 -0800
----------------------------------------------------------------------
.../TestExceptionInStateModelReset.java | 19 +++++++++++++++++++
.../apache/helix/manager/zk/TestZkFlapping.java | 19 +++++++++++++++++++
2 files changed, 38 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/4f724271/helix-core/src/test/java/org/apache/helix/integration/TestExceptionInStateModelReset.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestExceptionInStateModelReset.java b/helix-core/src/test/java/org/apache/helix/integration/TestExceptionInStateModelReset.java
index a5512c1..2d8a815 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestExceptionInStateModelReset.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestExceptionInStateModelReset.java
@@ -1,5 +1,24 @@
package org.apache.helix.integration;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.util.Date;
import org.apache.helix.HelixDataAccessor;
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/4f724271/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkFlapping.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkFlapping.java b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkFlapping.java
index 5b35148..b0ceba6 100644
--- a/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkFlapping.java
+++ b/helix-core/src/test/java/org/apache/helix/manager/zk/TestZkFlapping.java
@@ -1,5 +1,24 @@
package org.apache.helix.manager.zk;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.util.Date;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;