You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/03 14:57:05 UTC
[10/39] incubator-ignite git commit: Merge branch 'ignite-sprint-6'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-621
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-621
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4e31be6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4e31be6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4e31be6
Branch: refs/heads/ignite-747
Commit: a4e31be6a018f1711ec0cb385c6b88b35c9dffed
Parents: c94c0c4 285d790
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Mon Jun 22 15:29:47 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Mon Jun 22 15:29:47 2015 -0700
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../ignite/internal/MarshallerContextImpl.java | 12 +-
.../processors/cache/GridCacheIoManager.java | 64 ++++--
.../GridCachePartitionExchangeManager.java | 70 +++----
.../processors/cache/GridCacheSwapManager.java | 12 +-
.../GridDhtPartitionsExchangeFuture.java | 49 +++--
.../offheap/GridOffHeapProcessor.java | 19 +-
.../apache/ignite/internal/util/GridDebug.java | 37 ++--
.../communication/tcp/TcpCommunicationSpi.java | 61 +++---
.../tcp/TcpCommunicationSpiMBean.java | 8 +
.../ignite/spi/discovery/tcp/ClientImpl.java | 68 ++++---
.../GridCacheAbstractFailoverSelfTest.java | 6 +-
.../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +++++++++++
.../GridTcpCommunicationSpiConfigSelfTest.java | 1 -
.../testsuites/IgniteCacheTestSuite3.java | 1 +
.../processors/query/h2/IgniteH2Indexing.java | 2 +
.../query/h2/twostep/GridMapQueryExecutor.java | 23 ++-
.../cache/IgniteCacheOffheapEvictQueryTest.java | 196 +++++++++++++++++++
.../IgniteCacheQuerySelfTestSuite.java | 1 +
19 files changed, 590 insertions(+), 162 deletions(-)
----------------------------------------------------------------------