ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [11/49] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-611-1
Date Tue, 31 Mar 2015 12:48:42 GMT
Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-611-1

Conflicts:
	modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/36834b82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/36834b82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/36834b82

Branch: refs/heads/ignite-654
Commit: 36834b82ab490fb7bb6222a8329eeb781638a627
Parents: 30a6b12 8aaa5ce
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Fri Mar 27 11:52:26 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Fri Mar 27 11:52:26 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 ++
 ...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 +
 23 files changed, 289 insertions(+), 110 deletions(-)
----------------------------------------------------------------------



Mime
View raw message