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 8EFE718405 for ; Wed, 15 Jul 2015 03:17:04 +0000 (UTC) Received: (qmail 24392 invoked by uid 500); 15 Jul 2015 03:17:04 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 24360 invoked by uid 500); 15 Jul 2015 03:17:04 -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 24351 invoked by uid 99); 15 Jul 2015 03:17:04 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jul 2015 03:17:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id CBE95C0098 for ; Wed, 15 Jul 2015 03:17:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id FZZZit730noL for ; Wed, 15 Jul 2015 03:16:55 +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 58D30428DB for ; Wed, 15 Jul 2015 03:16:55 +0000 (UTC) Received: (qmail 24327 invoked by uid 99); 15 Jul 2015 03:16:54 -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 03:16:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 52061E025B; Wed, 15 Jul 2015 03:16:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Message-Id: <3df037fa1f50482db94812c5cc556021@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: IGNITE-843 Removed "none" template. Date: Wed, 15 Jul 2015 03:16:54 +0000 (UTC) Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 974b408be -> 9b6c2420a IGNITE-843 Removed "none" template. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b6c2420 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b6c2420 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b6c2420 Branch: refs/heads/ignite-843 Commit: 9b6c2420a40004e4d87c72879955ccdf2849de31 Parents: 974b408 Author: AKuznetsov Authored: Wed Jul 15 10:16:54 2015 +0700 Committer: AKuznetsov Committed: Wed Jul 15 10:16:54 2015 +0700 ---------------------------------------------------------------------- .../nodejs/controllers/clusters-controller.js | 5 ++--- .../nodejs/controllers/models/clusters.json | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b6c2420/modules/web-control-center/nodejs/controllers/clusters-controller.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/controllers/clusters-controller.js b/modules/web-control-center/nodejs/controllers/clusters-controller.js index 8485de1..54a5a27 100644 --- a/modules/web-control-center/nodejs/controllers/clusters-controller.js +++ b/modules/web-control-center/nodejs/controllers/clusters-controller.js @@ -21,9 +21,8 @@ controlCenterModule.controller('clustersController', ['$scope', '$http', 'common $scope.getModel = commonFunctions.getModel; $scope.templates = [ - {value: {discovery: {Vm: {addresses: ['127.0.0.1:47500..47510']}}}, label: 'none'}, - {value: {discovery: {kind: 'Vm', Vm: {addresses: ['127.0.0.1:47500..47510']}}}, label: 'local'}, - {value: {discovery: {kind: 'Multicast', Vm: {addresses: ['127.0.0.1:47500..47510']}, Multicast: {}}}, label: 'multicast'} + {value: {discovery: {kind: 'Multicast', Vm: {addresses: ['127.0.0.1:47500..47510']}, Multicast: {}}}, label: 'multicast'}, + {value: {discovery: {kind: 'Vm', Vm: {addresses: ['127.0.0.1:47500..47510']}}}, label: 'local'} ]; $scope.discoveries = [ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b6c2420/modules/web-control-center/nodejs/controllers/models/clusters.json ---------------------------------------------------------------------- diff --git a/modules/web-control-center/nodejs/controllers/models/clusters.json b/modules/web-control-center/nodejs/controllers/models/clusters.json index 2a2253c..e480e9d 100644 --- a/modules/web-control-center/nodejs/controllers/models/clusters.json +++ b/modules/web-control-center/nodejs/controllers/models/clusters.json @@ -3,11 +3,10 @@ "Configure cluster, link caches to them and go to Summary for configuration generation." ], "templateTip": [ - "Use following template for add cluster:", + "Use following template to add a new cluster:", "
    ", - "
  • none - Empty configuration.
    • ", - "
  • local - Configuration with static ips discovery and pre-configured list of IP addresses.
    • ", - "
  • multicast - Configuration with multicast discovery.
    • ", + "
  • multicast - cluster with multicast discovery.
    • ", + "
  • local - cluster with static ips discovery and pre-configured list of IP addresses.
    • ", "
" ], "general": [ @@ -25,7 +24,7 @@ "placeholder": "Choose caches", "items": "caches", "tip": [ - "Select caches to start in cluster." + "Select caches to start in cluster or add a new cache." ], "addLink": { "label": "Add cache(s)",