Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-290
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/beb3e47c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/beb3e47c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/beb3e47c Branch: refs/heads/ignite-141-2 Commit: beb3e47c476064df4f4f9d1b3bb80649d53c3016 Parents: 1209175 c5a15a1 Author: avinogradov <avinogra...@gridgain.com> Authored: Wed Feb 18 12:42:58 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Wed Feb 18 12:42:58 2015 +0300 ---------------------------------------------------------------------- bin/include/target-classpath.bat | 4 +- bin/include/target-classpath.sh | 10 ++- .../processors/cache/IgniteCacheProxy.java | 6 +- .../cache/distributed/dht/GridDhtGetFuture.java | 1 - .../security/GridSecurityContext.java | 9 ++- .../cache/VisorCacheDefaultConfiguration.java | 57 --------------- .../visor/node/VisorNodeDataCollectorJob.java | 50 +++++++++++--- .../visor/node/VisorSpisConfiguration.java | 34 --------- .../internal/visor/util/VisorEventMapper.java | 73 ++++++++++++++++++++ .../internal/visor/util/VisorTaskUtils.java | 60 ++++++++-------- .../commands/cache/VisorCacheCommand.scala | 3 - .../config/VisorConfigurationCommand.scala | 2 - .../commands/events/VisorEventsCommand.scala | 14 ++-- 13 files changed, 166 insertions(+), 157 deletions(-) ----------------------------------------------------------------------
