You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/07 15:35:06 UTC
[32/32] ignite git commit: Merge branch 'master-bak'
Merge branch 'master-bak'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5f01d00b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5f01d00b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5f01d00b
Branch: refs/heads/master
Commit: 5f01d00b0e7c30e6174d8534efbf3fdc69058c7a
Parents: 27eb860 fb46316
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Sep 7 16:34:46 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Sep 7 16:34:46 2015 +0300
----------------------------------------------------------------------
RELEASE_NOTES.txt | 13 +-
.../messaging/MessagingPingPongExample.java | 6 +-
.../CacheClientPortableQueryExample.java | 3 -
.../messaging/MessagingPingPongExample.java | 2 +-
.../examples/MessagingExamplesSelfTest.java | 3 +-
.../examples/MessagingExamplesSelfTest.java | 3 +-
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../ignite/internal/MarshallerContextImpl.java | 31 ++--
.../distributed/dht/GridDhtLocalPartition.java | 51 +++++-
.../dht/GridPartitionedGetFuture.java | 14 +-
.../distributed/near/GridNearGetFuture.java | 13 ++
.../query/GridCacheDistributedQueryFuture.java | 5 +-
.../query/GridCacheDistributedQueryManager.java | 9 +-
.../cache/query/GridCacheQueryManager.java | 177 ++++++-------------
.../cache/query/GridCacheQueryRequest.java | 59 ++++++-
.../visor/cache/VisorCacheStartTask.java | 6 +-
.../messages/TcpDiscoveryClientAckResponse.java | 2 +-
.../cache/GridCacheIncrementTransformTest.java | 2 +-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 5 -
.../IgniteCacheNodeJoinAbstractTest.java | 42 +++++
.../main/cpp/common/project/vs/common.vcxproj | 10 +-
.../platform/src/main/cpp/common/src/java.cpp | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
24 files changed, 282 insertions(+), 182 deletions(-)
----------------------------------------------------------------------