Merge branch 'ignite-sprint-3' into gg-10046
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cf058808 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf058808 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf058808 Branch: refs/heads/gg-10046 Commit: cf058808bb5bedfcbc491f842c6162af8f850a7d Parents: d84bccd a60f47d Author: Artem Shutak <[email protected]> Authored: Thu Apr 9 20:06:31 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Thu Apr 9 20:06:31 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCluster.java | 2 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheProjectionImpl.java | 2 +- .../processors/cache/GridCacheProxyImpl.java | 2 +- .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/version/GridCacheVersionEx.java | 2 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../datastructures/GridCacheQueueAdapter.java | 2 +- .../util/lang/GridMetadataAwareAdapter.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +- .../query/h2/sql/GridSqlQueryParser.java | 24 ++++++++++++++------ .../query/h2/sql/BaseH2CompareQueryTest.java | 12 ++++++---- .../ignite/tools/javadoc/IgniteLinkTaglet.java | 20 ++++++++-------- .../scala/org/apache/ignite/visor/visor.scala | 3 +++ 15 files changed, 48 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
