Merge branches 'ignite-960' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-960
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca89d81c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca89d81c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca89d81c Branch: refs/heads/ignite-950 Commit: ca89d81c3e271ea2f905698540b67df8a2cab079 Parents: a7ca45b ae188c7 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Jun 16 17:37:34 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Jun 16 17:37:34 2015 +0300 ---------------------------------------------------------------------- .../internal/interop/InteropBootstrap.java | 3 +- .../internal/interop/InteropIgnition.java | 5 +- .../processors/query/GridQueryProcessor.java | 102 ++++++--- .../ignite/spi/discovery/tcp/ClientImpl.java | 87 +++++--- .../apache/ignite/internal/GridSelfTest.java | 12 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 17 +- .../GridCacheAbstractFailoverSelfTest.java | 2 + ...ridCacheMultinodeUpdateAbstractSelfTest.java | 9 + .../cache/GridCacheVersionMultinodeTest.java | 8 +- ...CacheP2pUnmarshallingRebalanceErrorTest.java | 15 +- .../IgniteCacheClientNodeConcurrentStart.java | 14 +- .../distributed/IgniteCacheManyClientsTest.java | 69 +++++-- .../GridCachePartitionedTxSalvageSelfTest.java | 37 +--- .../junits/common/GridCommonAbstractTest.java | 11 +- .../IgniteCacheFailoverTestSuite.java | 8 - .../IgniteCacheFailoverTestSuite2.java | 47 +++++ .../CacheAbstractQueryMetricsSelfTest.java | 205 ++++++++++++++++++ .../CachePartitionedQueryMetricsSelfTest.java | 32 +++ .../CacheReplicatedQueryMetricsSelfTest.java | 32 +++ .../cache/GridCacheQueryMetricsSelfTest.java | 206 ------------------- .../query/h2/sql/BaseH2CompareQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- 22 files changed, 581 insertions(+), 346 deletions(-) ----------------------------------------------------------------------
