Merge branch 'ignite-565' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-565
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1dd8303 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1dd8303 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1dd8303 Branch: refs/heads/ignite-443 Commit: f1dd8303267d36a1c87890010d004fe3804b1a4e Parents: de53fbb 659aecc Author: sboikov <sboi...@gridgain.com> Authored: Fri Mar 27 14:16:42 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Mar 27 14:16:42 2015 +0300 ---------------------------------------------------------------------- assembly/libs/README.txt | 1 - modules/core/pom.xml | 14 ++- .../org/apache/ignite/events/CacheEvent.java | 13 ++- .../ignite/events/CacheRebalancingEvent.java | 2 +- .../org/apache/ignite/events/EventType.java | 41 ++++---- .../internal/MarshallerContextAdapter.java | 5 +- .../ignite/internal/MarshallerContextImpl.java | 65 ++++++------- .../discovery/GridDiscoveryManager.java | 7 +- .../dht/GridDhtPartitionTopologyImpl.java | 5 +- .../preloader/GridDhtPartitionDemandPool.java | 15 +-- .../visor/event/VisorGridEventsLost.java | 7 +- .../ignite/lang/IgniteProductVersion.java | 2 +- .../ignite/marshaller/MarshallerContext.java | 5 +- .../optimized/OptimizedMarshallerUtils.java | 2 +- .../org/jsr166/ConcurrentLinkedHashMap.java | 9 ++ .../GridProjectionForCachesSelfTest.java | 2 +- ...idCacheValueConsistencyAbstractSelfTest.java | 45 ++++++++- ...heValueConsistencyTransactionalSelfTest.java | 2 +- .../IgniteClientAffinityAssignmentSelfTest.java | 99 ++++++++++++++++---- ...ridCachePartitionNotLoadedEventSelfTest.java | 8 +- ...sistencyAtomicPrimaryWriteOrderSelfTest.java | 32 +++++++ ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../GridConcurrentLinkedHashMapSelfTest.java | 17 ++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + 24 files changed, 290 insertions(+), 111 deletions(-) ----------------------------------------------------------------------
