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 96B31186DE for ; Wed, 15 Jul 2015 19:17:07 +0000 (UTC) Received: (qmail 18170 invoked by uid 500); 15 Jul 2015 19:17:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 18139 invoked by uid 500); 15 Jul 2015 19:17:07 -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 18130 invoked by uid 99); 15 Jul 2015 19:17:07 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jul 2015 19:17:07 +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 086821A700D for ; Wed, 15 Jul 2015 19:17:07 +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-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id iSxlrHYJQ7XH for ; Wed, 15 Jul 2015 19:16:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 4A70621143 for ; Wed, 15 Jul 2015 19:16:51 +0000 (UTC) Received: (qmail 16926 invoked by uid 99); 15 Jul 2015 19:16:49 -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; Wed, 15 Jul 2015 19:16:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4BA69E2F31; Wed, 15 Jul 2015 19:16:49 +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: Wed, 15 Jul 2015 19:16:51 -0000 Message-Id: <5df600a087a449d8857539d5905521c5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [03/45] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-843' into ignite-843 Merge remote-tracking branch 'origin/ignite-843' into ignite-843 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f0701d3f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f0701d3f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f0701d3f Branch: refs/heads/ignite-1121 Commit: f0701d3fd71ed4c202e3f74af790486b40868624 Parents: 6acfa14 14bb9dc Author: Andrey Authored: Mon Jul 13 16:26:46 2015 +0700 Committer: Andrey Committed: Mon Jul 13 16:26:46 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/caches-controller.js | 11 +++++++++++ .../nodejs/controllers/common-module.js | 3 +++ .../nodejs/views/includes/controls.jade | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0701d3f/modules/web-control-center/nodejs/controllers/common-module.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f0701d3f/modules/web-control-center/nodejs/views/includes/controls.jade ----------------------------------------------------------------------