ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [13/13] ignite git commit: Merge branch 'master' into ignite-2314
Date Sun, 03 Jan 2016 20:23:51 GMT
Merge branch 'master' into ignite-2314

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java


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

Branch: refs/heads/ignite-2314
Commit: 51cdfd4486aeb44ebad341d2198e3f7f0ca458b9
Parents: 3f3dcf4 cd5cd2e
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Sun Jan 3 23:24:12 2016 +0400
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Sun Jan 3 23:24:12 2016 +0400

----------------------------------------------------------------------
 doap_Ignite.rdf                                 |   67 +
 .../configuration/FileSystemConfiguration.java  |   10 +-
 .../apache/ignite/internal/IgniteKernal.java    |   27 +-
 .../internal/cluster/ClusterGroupAdapter.java   |   10 +-
 .../discovery/GridDiscoveryManager.java         |   19 +-
 .../loadbalancer/GridLoadBalancerManager.java   |    8 +-
 .../processors/cache/GridCacheAdapter.java      |   14 +-
 .../processors/cache/GridCacheContext.java      |    3 +-
 .../cache/GridCacheEvictionManager.java         |    5 +-
 .../processors/cache/GridCacheIoManager.java    |    5 +-
 .../processors/cache/GridCacheIterator.java     |    4 +-
 .../processors/cache/GridCacheKeySet.java       |    2 +-
 .../GridCachePartitionExchangeManager.java      |   12 +-
 .../processors/cache/GridCacheProcessor.java    |    9 +-
 .../processors/cache/GridCacheSwapManager.java  |    7 +-
 .../processors/cache/GridCacheUtils.java        |   92 +
 .../cache/GridCacheValueCollection.java         |    5 +-
 .../processors/cache/IgniteCacheProxy.java      |    4 +-
 .../GridDistributedTxRemoteAdapter.java         |   12 +-
 .../dht/CacheDistributedGetFutureAdapter.java   |   10 +-
 .../dht/GridClientPartitionTopology.java        |    3 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |    3 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |    3 +-
 .../distributed/dht/GridDhtTxFinishFuture.java  |   15 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   31 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |    3 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |   53 +-
 .../dht/GridPartitionedGetFuture.java           |    2 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   21 +-
 .../dht/preloader/GridDhtForceKeysFuture.java   |    8 +-
 .../distributed/near/GridNearCacheAdapter.java  |   11 +-
 .../distributed/near/GridNearGetFuture.java     |    2 +-
 ...arOptimisticSerializableTxPrepareFuture.java |   94 +-
 .../near/GridNearOptimisticTxPrepareFuture.java |   63 +-
 .../GridNearPessimisticTxPrepareFuture.java     |    6 +-
 .../cache/distributed/near/GridNearTxLocal.java |   69 +-
 .../near/GridNearTxPrepareFutureAdapter.java    |    8 +-
 .../cache/local/GridLocalLockFuture.java        |   19 +-
 .../local/atomic/GridLocalAtomicCache.java      |   17 +-
 .../cache/transactions/IgniteTxAdapter.java     |   24 +-
 .../cache/transactions/IgniteTxEntry.java       |   12 +-
 .../transactions/IgniteTxLocalAdapter.java      |   38 +-
 .../version/GridCachePlainVersionedEntry.java   |    2 +-
 .../GridCacheAtomicStampedImpl.java             |    5 +-
 .../internal/processors/igfs/IgfsImpl.java      |    2 +-
 .../internal/processors/igfs/IgfsProcessor.java |    8 +-
 .../platform/PlatformAbstractTarget.java        |   17 +-
 .../processors/platform/PlatformTarget.java     |   22 +
 .../platform/compute/PlatformCompute.java       |   34 +-
 .../dotnet/PlatformDotNetCacheStore.java        |    4 +-
 .../platform/utils/PlatformFutureUtils.java     |  119 +-
 .../platform/utils/PlatformListenable.java      |   47 +
 .../top/GridTopologyCommandHandler.java         |    3 +-
 .../org/apache/ignite/internal/util/F0.java     |  325 +---
 .../internal/util/GridExecutionStatistics.java  |    4 +-
 .../ignite/internal/util/IgniteUtils.java       |   44 +-
 .../ignite/internal/util/lang/GridFunc.java     | 1776 ++++--------------
 .../ignite/internal/util/lang/GridTuple3.java   |    1 -
 .../ignite/internal/util/lang/GridTuple4.java   |    1 -
 .../ignite/internal/util/lang/GridTuple5.java   |    1 -
 .../ignite/internal/util/lang/GridTuple6.java   |    1 -
 .../ignite/internal/util/lang/GridTupleV.java   |    1 -
 .../ignite/internal/util/nio/GridNioServer.java |   13 +-
 .../java/org/apache/ignite/lang/IgniteUuid.java |    2 +-
 .../memory/MemoryEventStorageSpi.java           |    1 +
 .../internal/GridUpdateNotifierSelfTest.java    |    2 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    |    4 +-
 .../cache/IgniteCacheStoreCollectionTest.java   |  163 ++
 .../distributed/GridCacheEventAbstractTest.java |    2 +-
 .../IpcSharedMemoryCrashDetectionSelfTest.java  |   16 +-
 .../ignite/lang/GridBasicPerformanceTest.java   |   10 +-
 .../ignite/lang/GridFuncPerformanceTest.java    |  102 -
 .../ignite/loadtest/GridLoadTestStatistics.java |    2 +-
 ...condaryFileSystemInitializationSelfTest.java |    2 +-
 .../query/h2/opt/GridH2TreeIndex.java           |    4 +-
 .../cpp/common/include/ignite/common/exports.h  |    7 +-
 .../cpp/common/include/ignite/common/java.h     |   13 +-
 .../platforms/cpp/common/project/vs/module.def  |    6 +-
 modules/platforms/cpp/common/src/exports.cpp    |   20 +-
 modules/platforms/cpp/common/src/java.cpp       |   70 +-
 .../Compute/ComputeApiTest.cs                   |   20 +
 .../Apache.Ignite.Core.csproj                   |    2 +
 .../Common/IgniteFutureCancelledException.cs    |   65 +
 .../Apache.Ignite.Core/Compute/ICompute.cs      |  233 +++
 .../Impl/Common/CancelledTask.cs                |   47 +
 .../Apache.Ignite.Core/Impl/Common/Future.cs    |   74 +-
 .../Apache.Ignite.Core/Impl/Compute/Compute.cs  |  157 +-
 .../Impl/Compute/ComputeImpl.cs                 |   15 +-
 .../Apache.Ignite.Core/Impl/ExceptionUtils.cs   |    4 +
 .../Apache.Ignite.Core/Impl/PlatformTarget.cs   |   52 +
 .../Impl/Unmanaged/IgniteJniNativeMethods.cs    |   16 +-
 .../Impl/Unmanaged/UnmanagedUtils.cs            |   31 +-
 92 files changed, 2149 insertions(+), 2253 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/51cdfd44/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------


Mime
View raw message