Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a293f9be Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a293f9be Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a293f9be Branch: refs/heads/ignite-1537 Commit: a293f9bef7c99034840edbd87cfad7877829fda1 Parents: bfe74ed 895760e Author: sboikov <[email protected]> Authored: Thu Nov 26 21:34:33 2015 +0300 Committer: sboikov <[email protected]> Committed: Thu Nov 26 21:34:33 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 17 +++ .../ComputeFibonacciContinuationExample.java | 15 ++- .../computegrid/ComputeTaskMapExample.java | 6 +- .../computegrid/ComputeTaskSplitExample.java | 4 +- .../examples/messaging/MessagingExample.java | 18 +-- .../examples/misc/springbean/spring-bean.xml | 7 -- .../testsuites/IgniteExamplesSelfTestSuite.java | 4 +- .../apache/ignite/cache/CacheInterceptor.java | 2 +- .../rendezvous/RendezvousAffinityFunction.java | 2 +- .../portable/GridPortableMarshaller.java | 3 + .../internal/portable/PortableContext.java | 10 +- .../ignite/internal/portable/PortableUtils.java | 7 ++ .../processors/cache/GridCacheAdapter.java | 65 +++++++--- .../cache/GridCacheConcurrentMap.java | 16 +-- .../processors/cache/GridCacheEventManager.java | 4 +- .../processors/cache/GridCacheIoManager.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 15 ++- .../cache/distributed/dht/GridDhtGetFuture.java | 28 +++-- .../dht/GridPartitionedSingleGetFuture.java | 16 +-- .../distributed/near/GridNearGetRequest.java | 3 +- .../near/GridNearSingleGetRequest.java | 12 +- .../near/GridNearSingleGetResponse.java | 13 +- .../processors/query/GridQueryProcessor.java | 8 ++ .../util/future/GridCompoundFuture.java | 7 +- .../internal/util/future/GridFutureAdapter.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 14 ++- .../session/GridSessionCheckpointSelfTest.java | 16 +++ .../tcp/IgniteCacheSslStartStopSelfTest.java | 1 + ...ObjectsCacheDataStructuresSelfTestSuite.java | 33 +++++ ...BinaryObjectsCacheExpiryPolicyTestSuite.java | 34 ++++++ ...gniteBinaryObjectsCacheRestartTestSuite.java | 33 +++++ .../IgniteBinaryObjectsCacheTestSuite3.java | 33 +++++ .../IgniteBinaryObjectsCacheTestSuite4.java | 33 +++++ ...IgniteBinaryObjectsComputeGridTestSuite.java | 33 +++++ .../IgniteCacheFailoverTestSuite3.java | 6 - .../IgniteCacheFailoverTestSuiteSsl.java | 41 +++++++ .../cache/IgniteCacheNoClassQuerySelfTest.java | 122 +++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 39 files changed, 572 insertions(+), 121 deletions(-) ----------------------------------------------------------------------
