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 2B9BC10ADA for ; Thu, 3 Sep 2015 09:06:44 +0000 (UTC) Received: (qmail 97771 invoked by uid 500); 3 Sep 2015 09:06:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 97735 invoked by uid 500); 3 Sep 2015 09:06:44 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 97690 invoked by uid 99); 3 Sep 2015 09:06: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; Thu, 03 Sep 2015 09:06:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E442CE0061; Thu, 3 Sep 2015 09:06:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Thu, 03 Sep 2015 09:06:44 -0000 Message-Id: <08575912faf0401c857e3a137ce47ab3@git.apache.org> In-Reply-To: <984aacba38d34243a1436db74e18552e@git.apache.org> References: <984aacba38d34243a1436db74e18552e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b1ff693 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b1ff693 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b1ff693 Branch: refs/heads/ignite-843 Commit: 4b1ff69322250098348d48d9b70a59ffc5003324 Parents: b500eb1 1e84e8c Author: Andrey Authored: Thu Sep 3 16:07:22 2015 +0700 Committer: Andrey Committed: Thu Sep 3 16:07:22 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/caches-controller.js | 1 - .../main/js/controllers/clusters-controller.js | 1 - .../src/main/js/controllers/common-module.js | 18 ------------------ .../main/js/controllers/metadata-controller.js | 1 - .../src/main/js/controllers/sql-controller.js | 14 +++++++++----- .../src/main/js/public/stylesheets/style.scss | 4 ++++ .../src/main/js/views/includes/controls.jade | 10 +++++----- 7 files changed, 18 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4b1ff693/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4b1ff693/modules/control-center-web/src/main/js/public/stylesheets/style.scss ----------------------------------------------------------------------