Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 C80FC18B47 for ; Fri, 31 Jul 2015 07:46:58 +0000 (UTC) Received: (qmail 84985 invoked by uid 500); 31 Jul 2015 07:46:58 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 84952 invoked by uid 500); 31 Jul 2015 07:46:58 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 84942 invoked by uid 99); 31 Jul 2015 07:46:58 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 07:46:58 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 3F3B51A937B for ; Fri, 31 Jul 2015 07:46:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id GXTfk3Mor2l6 for ; Fri, 31 Jul 2015 07:46:50 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id BAA665060D for ; Fri, 31 Jul 2015 07:46:44 +0000 (UTC) Received: (qmail 83741 invoked by uid 99); 31 Jul 2015 07:46:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 07:46:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 25EB4DF9C2; Fri, 31 Jul 2015 07:46:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 31 Jul 2015 07:46:52 -0000 Message-Id: In-Reply-To: <8668856204024eccba84d17ea8a87232@git.apache.org> References: <8668856204024eccba84d17ea8a87232@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-1121' into ignite-1121 Merge remote-tracking branch 'origin/ignite-1121' into ignite-1121 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f58d8133 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f58d8133 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f58d8133 Branch: refs/heads/ignite-1155_1 Commit: f58d813307d12e6173b11ca7133a151e146f2745 Parents: 0ff3504 aa3fc51 Author: Andrey Authored: Tue Jul 28 10:54:19 2015 +0700 Committer: Andrey Committed: Tue Jul 28 10:54:19 2015 +0700 ---------------------------------------------------------------------- modules/web-control-center/src/main/js/db.js | 4 +-- .../src/main/js/routes/caches.js | 2 +- .../src/main/js/routes/clusters.js | 2 +- .../src/main/js/routes/generator/xml.js | 29 +++++++++++++++++++- .../src/main/js/routes/metadata.js | 2 +- 5 files changed, 33 insertions(+), 6 deletions(-) ----------------------------------------------------------------------