Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 314D3200B30 for ; Mon, 20 Jun 2016 04:58:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3003C160A53; Mon, 20 Jun 2016 02:58:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1472A160A81 for ; Mon, 20 Jun 2016 04:58:25 +0200 (CEST) Received: (qmail 11143 invoked by uid 500); 20 Jun 2016 02:58:25 -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 9805 invoked by uid 99); 20 Jun 2016 02:58:24 -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; Mon, 20 Jun 2016 02:58:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 920ECEAD98; Mon, 20 Jun 2016 02:58:24 +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: Mon, 20 Jun 2016 02:59:02 -0000 Message-Id: <58469364ae9c4afbadca6c8579736f35@git.apache.org> In-Reply-To: <6cf0e23e675044b38fc1a2607f95aa7e@git.apache.org> References: <6cf0e23e675044b38fc1a2607f95aa7e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [39/50] [abbrv] ignite git commit: Merge remote-tracking branch 'origin/web-console-staging' into ignite-3319 archived-at: Mon, 20 Jun 2016 02:58:28 -0000 Merge remote-tracking branch 'origin/web-console-staging' into ignite-3319 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f70157ee Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f70157ee Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f70157ee Branch: refs/heads/ignite-3262 Commit: f70157ee21a49c654571aa44cf5e8f4c3a17a378 Parents: af05c35 9b7c747 Author: Maxim Afanasiev Authored: Wed Jun 15 17:16:44 2016 +0700 Committer: Maxim Afanasiev Committed: Wed Jun 15 17:16:44 2016 +0700 ---------------------------------------------------------------------- .../main/js/app/modules/agent/agent.module.js | 3 +- .../form/field/input/datalist.directive.js | 6 ++-- .../modules/form/field/input/text.directive.js | 6 ++-- .../app/modules/form/group/group.directive.js | 6 ++-- .../states/configuration/caches/store.jade | 21 +++++++----- .../configuration/clusters/attributes.jade | 4 +-- .../configuration/clusters/communication.jade | 2 +- .../configuration/clusters/discovery.jade | 4 ++- .../main/js/controllers/caches-controller.js | 6 ++-- .../main/js/controllers/clusters-controller.js | 6 ++-- .../main/js/controllers/domains-controller.js | 6 ++-- .../src/main/js/controllers/igfs-controller.js | 6 ++-- .../src/main/js/controllers/sql-controller.js | 36 ++++++++------------ 13 files changed, 57 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f70157ee/modules/web-console/src/main/js/app/modules/form/field/input/datalist.directive.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f70157ee/modules/web-console/src/main/js/app/modules/form/field/input/text.directive.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f70157ee/modules/web-console/src/main/js/app/modules/form/group/group.directive.js ----------------------------------------------------------------------