Merge remote-tracking branch 'origin/sprint-1' into sprint-1-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2e0a415 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2e0a415 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2e0a415 Branch: refs/heads/ignite-189 Commit: c2e0a4153287e3188d79954a7f3d203887616481 Parents: c443245 5bd0db7 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Feb 12 13:20:10 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Feb 12 13:20:10 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheInvokeEntry.java | 35 +++++++++++++++++--- .../processors/cache/EvictableEntryImpl.java | 2 ++ .../processors/cache/IgniteCacheProxy.java | 6 ++-- .../ignite/visor/commands/VisorConsole.scala | 19 +++++------ .../config/VisorConfigurationCommand.scala | 11 +++--- .../commands/deploy/VisorDeployCommand.scala | 11 +++--- .../commands/disco/VisorDiscoveryCommand.scala | 21 +++++------- .../commands/events/VisorEventsCommand.scala | 15 ++++----- .../visor/commands/node/VisorNodeCommand.scala | 16 ++++----- .../commands/start/VisorStartCommand.scala | 9 +++-- .../commands/tasks/VisorTasksCommand.scala | 16 ++++----- .../commands/top/VisorTopologyCommand.scala | 22 ++++++------ .../visor/commands/vvm/VisorVvmCommand.scala | 22 ++++++------ 13 files changed, 106 insertions(+), 99 deletions(-) ----------------------------------------------------------------------
