You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/09/05 01:45:33 UTC
[09/30] ignite git commit: Merge branch 'ignite-1.4' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4
Merge branch 'ignite-1.4' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/826cb2f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/826cb2f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/826cb2f3
Branch: refs/heads/ignite-264
Commit: 826cb2f3b4bf1637fa607dcd148c53335bfb7c3f
Parents: bf64c6e 1f6d2ff
Author: S.Vladykin <sv...@gridgain.com>
Authored: Fri Sep 4 10:51:51 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Fri Sep 4 10:51:51 2015 +0300
----------------------------------------------------------------------
.../CacheClientPortablePutGetExample.java | 4 +
.../CacheClientPortableQueryExample.java | 5 +
.../configuration/CacheConfiguration.java | 31 ++--
.../apache/ignite/internal/IgniteKernal.java | 10 +-
.../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 ++++++-
.../IgniteCacheP2pUnmarshallingErrorTest.java | 5 -
.../IgniteCacheNodeJoinAbstractTest.java | 42 +++++
.../testsuites/IgniteCacheTestSuite3.java | 3 +-
13 files changed, 212 insertions(+), 165 deletions(-)
----------------------------------------------------------------------