Return-Path: X-Original-To: apmail-helix-commits-archive@minotaur.apache.org Delivered-To: apmail-helix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 78D57F5BA for ; Fri, 29 Mar 2013 00:04:24 +0000 (UTC) Received: (qmail 57645 invoked by uid 500); 29 Mar 2013 00:04:24 -0000 Delivered-To: apmail-helix-commits-archive@helix.apache.org Received: (qmail 57579 invoked by uid 500); 29 Mar 2013 00:04:24 -0000 Mailing-List: contact commits-help@helix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@helix.apache.org Delivered-To: mailing list commits@helix.apache.org Received: (qmail 57571 invoked by uid 99); 29 Mar 2013 00:04:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Mar 2013 00:04:24 +0000 X-ASF-Spam-Status: No, hits=-2001.3 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 29 Mar 2013 00:04:23 +0000 Received: (qmail 57054 invoked by uid 99); 29 Mar 2013 00:04:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Mar 2013 00:04:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CA6C4833799; Fri, 29 Mar 2013 00:04:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slu@apache.org To: commits@helix.incubator.apache.org Date: Fri, 29 Mar 2013 00:04:03 -0000 Message-Id: <927f1f21615c45f185c2e6fdced60081@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix X-Virus-Checked: Checked by ClamAV on 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 Authored: Thu Mar 28 17:03:53 2013 -0700 Committer: slu2011 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(-) ----------------------------------------------------------------------