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 <sevdoki...@gridgain.com> Authored: Mon Aug 10 18:59:51 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> 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(-) ----------------------------------------------------------------------
