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/12/24 07:10:25 UTC
[10/11] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f158b96
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f158b96
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f158b96
Branch: refs/heads/ignite-1537
Commit: 9f158b96d13e0dd2b916ea684c3c03f0cba66c7b
Parents: 6d6be6b bd05fa9
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 24 09:07:41 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 24 09:07:41 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/binary/BinaryContext.java | 2 +-
.../internal/binary/BinaryObjectImpl.java | 2 +-
.../query/GridCacheDistributedQueryManager.java | 6 +-
.../processors/query/GridQueryProcessor.java | 5 +
...iteCacheScanPredicateDeploymentSelfTest.java | 114 +++++++++++++++++
.../testsuites/IgniteCacheTestSuite3.java | 2 +
.../p2p/CacheDeploymentAlwaysTruePredicate.java | 29 +++++
.../ignite/tests/p2p/cache/PersonWrapper.java | 121 +++++++++++++++++++
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 16 ++-
...eBinaryWrappedObjectFieldsQuerySelfTest.java | 28 +++++
.../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +-
.../IgniteBinaryCacheQueryTestSuite.java | 4 +
.../IgniteCacheQuerySelfTestSuite.java | 4 +
14 files changed, 326 insertions(+), 11 deletions(-)
----------------------------------------------------------------------