Merge remote-tracking branch 'remotes/origin/ignite-142' into sprint-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/74e24c60 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74e24c60 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74e24c60 Branch: refs/heads/ignite-132 Commit: 74e24c60c127d48318b0c3cb63882e45fbcf06ce Parents: 53abd6b bceabb1 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Wed Jan 28 14:46:03 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed Jan 28 14:46:03 2015 +0300 ---------------------------------------------------------------------- .../ComputeFibonacciContinuationExample.java | 2 +- .../compute/ComputeRunnableExample.java | 2 +- .../singlesplit/SingleSplitsLoadTest.java | 2 +- .../ignite/client/ClientStartNodeTask.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 2 +- .../java/org/apache/ignite/IgniteCluster.java | 2 +- .../java/org/apache/ignite/IgniteCompute.java | 2 +- .../java/org/apache/ignite/IgniteEvents.java | 2 +- .../main/java/org/apache/ignite/IgniteFs.java | 2 +- .../java/org/apache/ignite/IgniteManaged.java | 2 +- .../java/org/apache/ignite/IgniteMessaging.java | 2 +- .../org/apache/ignite/internal/GridKernal.java | 2 +- .../ignite/internal/IgniteManagedImpl.java | 2 +- .../internal/executor/GridExecutorService.java | 2 +- .../processors/cache/GridCacheAdapter.java | 5 +-- .../cache/transactions/IgniteTxAdapter.java | 6 ++-- .../cache/transactions/IgniteTxProxyImpl.java | 2 +- .../internal/processors/fs/GridGgfsImpl.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 4 +-- .../cache/GridCacheQueryCommandHandler.java | 4 +-- .../handlers/task/GridTaskCommandHandler.java | 4 +-- .../apache/ignite/lang/IgniteAsyncSupport.java | 2 +- .../ignite/lang/IgniteAsyncSupportAdapter.java | 2 +- .../ignite/lang/IgniteAsyncSupported.java | 2 +- .../internal/GridCancelOnGridStopSelfTest.java | 2 +- .../GridCancelledJobsMetricsSelfTest.java | 2 +- .../internal/GridContinuousTaskSelfTest.java | 4 +-- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../GridFailoverCustomTopologySelfTest.java | 2 +- .../GridJobMasterLeaveAwareSelfTest.java | 34 ++++++++++---------- .../internal/GridMultipleJobsSelfTest.java | 2 +- .../internal/GridProjectionAbstractTest.java | 20 ++++++------ .../ignite/internal/GridReduceSelfTest.java | 2 +- .../GridTaskCancelSingleNodeSelfTest.java | 2 +- .../internal/GridTaskExecutionSelfTest.java | 2 +- .../GridTaskInstanceExecutionSelfTest.java | 2 +- .../internal/GridTaskJobRejectSelfTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 8 ++--- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- .../GridCacheGroupLockFailoverSelfTest.java | 2 +- .../cache/GridCachePutAllFailoverSelfTest.java | 4 +-- .../cache/IgniteCacheInvokeAbstractTest.java | 4 +-- .../GridCacheCountDownLatchSelfTest.java | 2 +- ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 4 +-- .../GridCacheAbstractJobExecutionTest.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheGlobalLoadTest.java | 2 +- .../GridCachePartitionedEntryLockSelfTest.java | 2 +- .../GridCachePartitionedLoadCacheSelfTest.java | 2 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- .../closure/GridClosureProcessorSelfTest.java | 16 ++++----- .../continuous/GridEventConsumeSelfTest.java | 8 ++--- .../processors/fs/GridGgfsTaskSelfTest.java | 2 +- .../GridServiceProcessorAbstractSelfTest.java | 18 +++++------ .../GridServiceProcessorMultiNodeSelfTest.java | 6 ++-- .../loadtest/GridSingleExecutionTest.java | 2 +- .../loadtests/colocation/GridTestMain.java | 2 +- .../multisplit/GridMultiSplitsLoadTest.java | 2 +- ...ridSingleSplitsNewNodesAbstractLoadTest.java | 2 +- .../ignite/loadtests/dsi/GridDsiClient.java | 2 +- ...GridJobExecutionLoadTestClientSemaphore.java | 2 +- ...JobExecutionSingleNodeSemaphoreLoadTest.java | 2 +- .../loadtests/job/GridJobLoadTestSubmitter.java | 2 +- .../mergesort/GridMergeSortLoadTask.java | 2 +- .../ignite/messaging/GridMessagingSelfTest.java | 2 +- ...idSessionFutureWaitJobAttributeSelfTest.java | 2 +- ...GridSessionSetJobAttributeOrderSelfTest.java | 2 +- ...sionSetJobAttributeWaitListenerSelfTest.java | 2 +- .../GridSessionSetTaskAttributeSelfTest.java | 2 +- ...GridSessionTaskWaitJobAttributeSelfTest.java | 2 +- .../GridSessionWaitAttributeSelfTest.java | 2 +- .../cache/GridAbstractCacheStoreSelfTest.java | 2 +- .../junits/common/GridCommonAbstractTest.java | 8 ++--- ...idHadoopDefaultMapReducePlannerSelfTest.java | 4 +-- .../GridProjectionStartStopRestartSelfTest.java | 2 +- 75 files changed, 138 insertions(+), 137 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74e24c60/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74e24c60/modules/core/src/test/java/org/apache/ignite/messaging/GridMessagingSelfTest.java ----------------------------------------------------------------------
