Merge branch 'master' into ignite-2523-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0a2755ff Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0a2755ff Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0a2755ff Branch: refs/heads/ignite-2523-1 Commit: 0a2755ff3a57833aceaf52019849b3b430e2a734 Parents: 53d9c2c 00f8d65 Author: vozerov-gridgain <[email protected]> Authored: Tue Apr 26 09:07:32 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Apr 26 09:07:32 2016 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/compute/ComputeJob.java | 2 +- .../ignite/compute/ComputeJobAfterSend.java | 2 +- .../compute/ComputeJobBeforeFailover.java | 2 +- .../ignite/compute/ComputeJobContext.java | 2 +- .../compute/ComputeJobContinuationAdapter.java | 12 ++++----- .../ignite/compute/ComputeLoadBalancer.java | 12 ++++----- .../org/apache/ignite/compute/ComputeTask.java | 26 ++++++++++---------- .../ignite/compute/ComputeTaskAdapter.java | 8 +++--- .../compute/ComputeTaskNoResultCache.java | 6 ++--- .../ignite/compute/ComputeTaskSession.java | 4 +-- .../ignite/compute/ComputeTaskSplitAdapter.java | 8 +++--- .../apache/ignite/compute/gridify/Gridify.java | 2 +- .../apache/ignite/igfs/mapreduce/IgfsTask.java | 6 ++--- .../ignite/internal/GridTaskSessionImpl.java | 2 +- .../internal/processors/job/GridJobWorker.java | 4 +-- .../GridResourceJobContextInjector.java | 4 +-- .../handlers/query/QueryCommandHandler.java | 8 +++++- .../processors/task/GridTaskProcessor.java | 6 ++--- .../processors/task/GridTaskWorker.java | 10 ++++---- .../org/apache/ignite/internal/util/F0.java | 4 +-- .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 4 +-- .../apache/ignite/internal/util/typedef/PN.java | 2 +- .../jobstealing/JobStealingDisabled.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 6 ++--- .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 13 ++++++---- .../spi/loadbalancing/LoadBalancingSpi.java | 8 +++--- .../adaptive/AdaptiveLoadBalancingSpi.java | 20 +++++++-------- .../adaptive/AdaptiveLoadProbe.java | 2 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 6 ++--- .../WeightedRandomLoadBalancingSpi.java | 14 +++++------ .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../GridTcpCommunicationBenchmark.java | 26 ++++++++++---------- .../GridP2PMissedResourceCacheSizeSelfTest.java | 6 ++--- .../scalar/pimps/ScalarProjectionPimp.scala | 4 +-- .../scalar/pimps/ScalarTaskThreadContext.scala | 4 +-- .../uri/GridUriDeploymentFileProcessor.java | 2 +- .../commands/top/VisorTopologyCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- 39 files changed, 133 insertions(+), 124 deletions(-) ----------------------------------------------------------------------
