Merge remote-tracking branch 'origin/ignite-960' 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/83abea4a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/83abea4a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/83abea4a Branch: refs/heads/ignite-950 Commit: 83abea4afd4fd5d66be111f5af8cf1a0d69a677e Parents: d530c8c 4025ce3 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Jun 16 18:48:16 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Jun 16 18:48:16 2015 +0300 ---------------------------------------------------------------------- .../cache/store/jdbc/CacheJdbcPojoStore.java | 3 - .../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 +- 23 files changed, 581 insertions(+), 349 deletions(-) ----------------------------------------------------------------------
