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/06/10 00:21:36 UTC
[14/14] incubator-ignite git commit: Merge branches 'ignite-484-1'
and 'ignite-sprint-5' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
Merge branches 'ignite-484-1' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ef50a38b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ef50a38b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ef50a38b
Branch: refs/heads/ignite-484-1
Commit: ef50a38b8627913c31950c0605cd962ea605ef1d
Parents: b38c2eb d48525c 91104a2
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Jun 10 01:11:48 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Wed Jun 10 01:11:48 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../affinity/GridAffinityAssignment.java | 12 ++
.../affinity/GridAffinityAssignmentCache.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +-
.../GridDhtPartitionsExchangeFuture.java | 14 ++-
.../continuous/GridContinuousProcessor.java | 2 +
.../util/nio/GridNioDelimitedBuffer.java | 2 +-
.../visor/node/VisorNodeDataCollectorTask.java | 9 +-
.../node/VisorNodeDataCollectorTaskResult.java | 17 +--
.../node/VisorNodeSuppressedErrorsTask.java | 12 +-
.../internal/visor/query/VisorQueryJob.java | 11 +-
.../internal/visor/query/VisorQueryTask.java | 3 +-
.../visor/util/VisorExceptionWrapper.java | 81 ++++++++++++++
.../internal/visor/util/VisorTaskUtils.java | 10 ++
.../continuous/GridEventConsumeSelfTest.java | 7 +-
.../nio/GridNioDelimitedBufferSelfTest.java | 112 +++++++++++++++++++
.../util/nio/GridNioDelimitedBufferTest.java | 112 -------------------
.../stream/socket/SocketStreamerSelfTest.java | 29 ++---
.../ignite/testsuites/IgniteBasicTestSuite.java | 1 +
.../testsuites/IgniteStreamSelfTestSuite.java | 39 +++++++
.../testsuites/IgniteStreamTestSuite.java | 39 -------
.../testsuites/IgniteUtilSelfTestSuite.java | 2 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 2 +-
.../cache/GridCacheOffheapIndexGetSelfTest.java | 62 +++++++++-
24 files changed, 388 insertions(+), 202 deletions(-)
----------------------------------------------------------------------