You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/08/10 18:01:08 UTC
[26/34] incubator-ignite git commit: Merge branches 'ignite-843' and
'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-843
Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6884c06b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6884c06b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6884c06b
Branch: refs/heads/ignite-1201
Commit: 6884c06ba75f91a75686e73f85021b95c1228f2a
Parents: 4714147 d9acbd1
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Aug 7 15:01:45 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Aug 7 15:01:45 2015 +0700
----------------------------------------------------------------------
assembly/release-hadoop.xml | 5 +
.../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 +---
26 files changed, 734 insertions(+), 551 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6884c06b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6884c06b/parent/pom.xml
----------------------------------------------------------------------