You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/12 09:39:59 UTC
[4/7] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-21
Merge remote-tracking branch 'remotes/origin/master' into ignite-21
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce518b18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce518b18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce518b18
Branch: refs/heads/master
Commit: ce518b187e6af490da9e67a91e3d861c0c9f270f
Parents: dae4b94 682e47f
Author: sboikov <sb...@gridgain.com>
Authored: Wed Dec 10 13:52:44 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Dec 10 13:52:44 2014 +0300
----------------------------------------------------------------------
.../ignite/spi/deployment/DeploymentSpi.java | 2 +-
.../grid/kernal/visor/VisorMultiNodeTask.java | 31 +++++++---
.../visor/node/VisorNodeDataCollectorJob.java | 64 ++++++++++++++++----
.../visor/node/VisorNodeDataCollectorTask.java | 24 ++++----
modules/core/src/test/config/tests.properties | 2 +-
...loymentClassLoaderMultiThreadedSelfTest.java | 4 +-
.../GridUriDeploymentFileProcessorSelfTest.java | 2 +-
.../GridUriDeploymentMultiScannersSelfTest.java | 2 +-
.../file/GridFileDeploymentSelfTest.java | 24 ++++----
.../GridFileDeploymentUndeploySelfTest.java | 4 +-
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 2 +-
.../http/GridHttpDeploymentSelfTest.java | 2 +-
12 files changed, 110 insertions(+), 53 deletions(-)
----------------------------------------------------------------------