Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-59

Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17d1b5fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17d1b5fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17d1b5fc

Branch: refs/heads/ignite-59
Commit: 17d1b5fce176d618913efa967b395f433d67b355
Parents: 8606a76 b4da38a
Author: sevdokimov <sevdoki...@gridgain.com>
Authored: Tue Jan 27 14:39:07 2015 +0300
Committer: sevdokimov <sevdoki...@gridgain.com>
Committed: Tue Jan 27 14:39:07 2015 +0300

----------------------------------------------------------------------
 examples/config/example-cache.xml               |   9 +-
 examples/config/example-compute.xml             |   9 +-
 examples/config/example-streamer.xml            |   9 +-
 examples/config/filesystem/example-ggfs.xml     |   9 +-
 .../examples/misc/springbean/spring-bean.xml    |   9 +-
 .../examples/ScalarStartStopExample.scala       |  73 ---
 .../examples/IgniteFsExamplesSelfTest.java      |  26 +-
 .../tests/examples/ScalarExamplesSelfTest.scala |   5 -
 .../ignite/internal/GridJobExecuteRequest.java  |  95 +--
 .../internal/GridJobExecuteRequestV2.java       | 185 ------
 .../managers/communication/GridIoManager.java   | 563 ++++++-----------
 .../managers/communication/GridIoMessage.java   |  53 +-
 .../processors/cache/GridCacheIoManager.java    |  22 +-
 .../processors/cache/GridCacheVersionEx.java    |   9 +
 .../preloader/GridDhtPartitionDemandPool.java   |  24 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |  10 +-
 .../query/GridCacheDistributedQueryManager.java |  23 -
 .../GridCacheContinuousQueryManager.java        |  11 -
 .../closure/GridClosureProcessor.java           | 624 ++++++++++++++-----
 .../GridMasterLeaveAwareComputeJobAdapter.java  |  36 --
 .../continuous/GridContinuousProcessor.java     |   1 -
 .../processors/job/GridJobProcessor.java        |   9 -
 .../internal/processors/job/GridJobWorker.java  |   6 -
 .../processors/resource/GridResourceUtils.java  |   4 +-
 .../processors/task/GridTaskProcessor.java      |  15 +-
 .../processors/task/GridTaskWorker.java         |  57 +-
 .../GridTcpCommunicationMessageFactory.java     |   5 +-
 .../shmem/GridIpcSharedMemoryNativeLoader.java  |   3 +-
 modules/core/src/test/config/ggfs-loopback.xml  |  41 +-
 .../core/src/test/config/ggfs-no-endpoint.xml   | 199 ------
 modules/core/src/test/config/ggfs-shmem.xml     |  41 +-
 .../communication/GridIoManagerSelfTest.java    |   2 +-
 .../cache/GridCacheVersionSelfTest.java         |  23 +-
 .../GridCacheSyncReplicatedPreloadSelfTest.java |   1 -
 .../ignite/session/GridSessionLoadSelfTest.java |  11 +-
 .../test/resources/spring-ping-pong-partner.xml |  38 +-
 36 files changed, 869 insertions(+), 1391 deletions(-)
----------------------------------------------------------------------


Reply via email to