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 56BA618FAC for ; Mon, 10 Aug 2015 16:01:18 +0000 (UTC) Received: (qmail 1715 invoked by uid 500); 10 Aug 2015 16:01:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 1684 invoked by uid 500); 10 Aug 2015 16:01:05 -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 1675 invoked by uid 99); 10 Aug 2015 16:01:05 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Aug 2015 16:01:05 +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 35710C0DF9 for ; Mon, 10 Aug 2015 16:01:05 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id Hy2rcZ3NXowc for ; Mon, 10 Aug 2015 16:00:54 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 841E831C13 for ; Mon, 10 Aug 2015 16:00:44 +0000 (UTC) Received: (qmail 96747 invoked by uid 99); 10 Aug 2015 16:00: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; Mon, 10 Aug 2015 16:00:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4DBB9E050A; Mon, 10 Aug 2015 16:00:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 10 Aug 2015 16:01:16 -0000 Message-Id: <4770f96e2a964e379380ced4329421a4@git.apache.org> In-Reply-To: <23b0f4c8a90b4e03b1b4ca5f19326ecd@git.apache.org> References: <23b0f4c8a90b4e03b1b4ca5f19326ecd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/34] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-843' into ignite-1201 Merge remote-tracking branch 'remotes/origin/ignite-843' into ignite-1201 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a03ab2ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a03ab2ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a03ab2ab Branch: refs/heads/ignite-1201 Commit: a03ab2ab7c227b79c70370c82a9204b95b9d806c Parents: 9c4b87e cb92fea Author: sevdokimov Authored: Mon Aug 10 18:59:51 2015 +0300 Committer: sevdokimov Committed: Mon Aug 10 18:59:51 2015 +0300 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 5 + modules/control-center-web/src/main/js/app.js | 13 +- .../js/controllers/cache-viewer-controller.js | 77 -- .../main/js/controllers/caches-controller.js | 16 +- .../main/js/controllers/clusters-controller.js | 19 +- .../src/main/js/controllers/common-module.js | 84 +- .../main/js/controllers/metadata-controller.js | 1108 +++++++++--------- .../src/main/js/controllers/models/caches.json | 14 +- .../main/js/controllers/models/clusters.json | 16 +- .../main/js/controllers/models/metadata.json | 367 +++--- modules/control-center-web/src/main/js/db.js | 5 +- .../control-center-web/src/main/js/package.json | 24 +- .../src/main/js/public/stylesheets/style.scss | 104 +- .../src/main/js/routes/agent.js | 2 +- .../src/main/js/routes/caches.js | 18 +- .../src/main/js/routes/clusters.js | 12 +- .../src/main/js/routes/notebooks.js | 38 +- .../src/main/js/routes/public.js | 133 ++- .../src/main/js/views/configuration/caches.jade | 53 +- .../main/js/views/configuration/clusters.jade | 57 +- .../main/js/views/configuration/metadata.jade | 99 +- .../main/js/views/configuration/summary.jade | 4 +- .../src/main/js/views/includes/controls.jade | 120 +- .../src/main/js/views/includes/header.jade | 4 +- .../src/main/js/views/login.jade | 33 +- .../src/main/js/views/reset.jade | 38 + .../src/main/js/views/sql/sql.jade | 7 +- .../src/main/js/views/templates/layout.jade | 4 +- .../cache/query/GridCacheSqlQuery.java | 33 +- .../cache/query/GridCacheTwoStepQuery.java | 34 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 28 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 5 + .../TcpDiscoveryMulticastIpFinder.java | 7 +- .../processors/query/h2/IgniteH2Indexing.java | 27 +- .../processors/query/h2/sql/GridSqlElement.java | 18 +- .../query/h2/sql/GridSqlFunction.java | 17 +- .../processors/query/h2/sql/GridSqlQuery.java | 4 +- .../query/h2/sql/GridSqlQueryParser.java | 94 +- .../query/h2/sql/GridSqlQuerySplitter.java | 117 +- .../processors/query/h2/sql/GridSqlSelect.java | 76 +- .../processors/query/h2/sql/GridSqlType.java | 24 +- .../processors/query/h2/sql/GridSqlUnion.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 211 ++-- .../query/h2/twostep/GridThreadLocalTable.java | 262 +++++ .../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +- modules/log4j2/README.txt | 15 +- .../ignite/logger/log4j2/Log4J2Logger.java | 2 +- .../ignite/logger/log4j2/Log4j2FileAware.java | 35 - .../org/apache/ignite/spark/IgniteContext.scala | 19 +- .../config/benchmark-multicast.properties | 1 + parent/pom.xml | 97 +- scripts/git-apply-patch.sh | 94 -- scripts/git-patch-functions.sh | 56 +- 53 files changed, 2021 insertions(+), 1733 deletions(-) ----------------------------------------------------------------------