Merge branch 'sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ff244d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ff244d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ff244d2 Branch: refs/heads/ignite-496 Commit: 0ff244d24e9ad85d70634f2f636922a05afa0b9e Parents: e08933d 82c354d Author: Artem Shutak <ashu...@gridgain.com> Authored: Fri Mar 27 11:32:01 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Fri Mar 27 11:32:01 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 +++ .../ignite/visor/commands/VisorConsole.scala | 4 +- .../commands/deploy/VisorDeployCommand.scala | 106 ++++++------- .../commands/start/VisorStartCommand.scala | 17 ++- .../commands/tasks/VisorTasksCommand.scala | 8 +- 26 files changed, 457 insertions(+), 285 deletions(-) ----------------------------------------------------------------------
