Merge branch 'sprint-2' into sprint-3
Conflicts:
modules/core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d19a1de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d19a1de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d19a1de
Branch: refs/heads/ignite-565
Commit: 3d19a1dee1b32685d504773be9faa047680b7da4
Parents: b53e531 71c6939
Author: vozerov-gridgain <[email protected]>
Authored: Fri Mar 27 09:13:16 2015 +0300
Committer: vozerov-gridgain <[email protected]>
Committed: Fri Mar 27 09:13:16 2015 +0300
----------------------------------------------------------------------
assembly/dependencies-visor-console.xml | 5 +
.../org/apache/ignite/events/CacheEvent.java | 25 +++-
.../ignite/events/CacheRebalancingEvent.java | 26 +++-
.../org/apache/ignite/events/EventType.java | 135 ++++++++++++-----
.../internal/MarshallerContextAdapter.java | 5 +-
.../ignite/internal/MarshallerContextImpl.java | 65 ++++----
.../discovery/GridDiscoveryManager.java | 7 +-
.../GridCachePartitionExchangeManager.java | 2 +-
.../dht/GridClientPartitionTopology.java | 10 +-
.../dht/GridDhtPartitionTopology.java | 4 +-
.../dht/GridDhtPartitionTopologyImpl.java | 20 ++-
.../preloader/GridDhtPartitionDemandPool.java | 18 ++-
.../ignite/internal/visor/cache/VisorCache.java | 2 +-
.../visor/event/VisorGridEventsLost.java | 7 +-
.../event/VisorGridSecuritySessionEvent.java | 91 ------------
.../ignite/lang/IgniteProductVersion.java | 2 +-
.../ignite/marshaller/MarshallerContext.java | 5 +-
.../optimized/OptimizedMarshallerUtils.java | 2 +-
.../org/jsr166/ConcurrentLinkedHashMap.java | 9 ++
.../GridProjectionForCachesSelfTest.java | 2 +-
...ridCachePartitionNotLoadedEventSelfTest.java | 148 +++++++++++++++++++
.../GridConcurrentLinkedHashMapSelfTest.java | 17 +++
.../commands/deploy/VisorDeployCommand.scala | 106 ++++++-------
.../commands/tasks/VisorTasksCommand.scala | 8 +-
24 files changed, 443 insertions(+), 278 deletions(-)
----------------------------------------------------------------------
