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 9598918954 for ; Wed, 23 Dec 2015 08:30:46 +0000 (UTC) Received: (qmail 44745 invoked by uid 500); 23 Dec 2015 08:30:40 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 44670 invoked by uid 500); 23 Dec 2015 08:30:40 -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 44652 invoked by uid 99); 23 Dec 2015 08:30:40 -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 Dec 2015 08:30:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 01A25E0948; Wed, 23 Dec 2015 08:30:39 +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 Dec 2015 08:30:41 -0000 Message-Id: <7b4d18c3a41c4645aeedf9d242fdcca1@git.apache.org> In-Reply-To: <9efdbf4aae9d4d49884e2e49e5d079ae@git.apache.org> References: <9efdbf4aae9d4d49884e2e49e5d079ae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] ignite git commit: Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2 Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/713debb1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/713debb1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/713debb1 Branch: refs/heads/ignite-843-rc2 Commit: 713debb1332817c3333a09eb85c8b20f85dbb665 Parents: d49cbe2 2077162 Author: Andrey Authored: Wed Dec 23 08:39:37 2015 +0700 Committer: Andrey Committed: Wed Dec 23 08:39:37 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/metadata-controller.js | 88 ++++++++++++-------- modules/control-center-web/src/main/js/db.js | 1 + .../main/js/helpers/generator/generator-java.js | 1 + .../main/js/helpers/generator/generator-xml.js | 1 + .../cache/VisorCacheStoreConfiguration.java | 13 ++- .../commands/cache/VisorCacheCommand.scala | 1 + .../config/benchmark-multicast.properties | 2 +- 7 files changed, 69 insertions(+), 38 deletions(-) ----------------------------------------------------------------------