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 A8F17179E5 for ; Wed, 23 Sep 2015 07:48:51 +0000 (UTC) Received: (qmail 28986 invoked by uid 500); 23 Sep 2015 07:48:51 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 28907 invoked by uid 500); 23 Sep 2015 07:48:51 -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 28891 invoked by uid 99); 23 Sep 2015 07:48:51 -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, 23 Sep 2015 07:48:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 62170DFB02; Wed, 23 Sep 2015 07:48:51 +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: Wed, 23 Sep 2015 07:48:52 -0000 Message-Id: <7af5a9d634214f298240bf8ccedf9c37@git.apache.org> In-Reply-To: References: 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/812db681 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/812db681 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/812db681 Branch: refs/heads/ignite-843 Commit: 812db6816a86b14b7df44a861cc3956339e48bc9 Parents: e1e8f83 301b8b4 Author: Andrey Authored: Wed Sep 23 14:48:59 2015 +0700 Committer: Andrey Committed: Wed Sep 23 14:48:59 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/caches-controller.js | 6 +++--- .../src/main/js/controllers/clusters-controller.js | 6 +++--- .../src/main/js/controllers/common-module.js | 3 +++ .../src/main/js/controllers/metadata-controller.js | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) ----------------------------------------------------------------------