You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by sl...@apache.org on 2013/03/29 01:04:02 UTC

[1/2] git commit: add missed license header

Updated Branches:
  refs/heads/master da01293ac -> 7c36c7d96


add missed license header

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

Branch: refs/heads/master
Commit: 4ab2d031319c103573d1be98a9c73db0bd0332a7
Parents: 404f3d8
Author: slu2011 <lu...@gmail.com>
Authored: Thu Mar 28 17:03:24 2013 -0700
Committer: slu2011 <lu...@gmail.com>
Committed: Thu Mar 28 17:03:24 2013 -0700

----------------------------------------------------------------------
 .../helix/integration/TestHelixInstanceTag.java    |   19 +++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/4ab2d031/helix-core/src/test/java/org/apache/helix/integration/TestHelixInstanceTag.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/TestHelixInstanceTag.java b/helix-core/src/test/java/org/apache/helix/integration/TestHelixInstanceTag.java
index 27e2c6c..0edd295 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/TestHelixInstanceTag.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/TestHelixInstanceTag.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.HashSet;
 import java.util.Set;
 


[2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix

Posted by sl...@apache.org.
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 <lu...@gmail.com>
Authored: Thu Mar 28 17:03:53 2013 -0700
Committer: slu2011 <lu...@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(-)
----------------------------------------------------------------------