You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/09 07:48:47 UTC
[14/18] ignite git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/02c7ef87
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/02c7ef87
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/02c7ef87
Branch: refs/heads/ignite-2753
Commit: 02c7ef877ec1bc620f716df57a72ba9bd8c6b369
Parents: 0122e48 cba4f4c
Author: dkarachentsev <dk...@gridgain.com>
Authored: Thu Mar 3 11:13:34 2016 +0300
Committer: dkarachentsev <dk...@gridgain.com>
Committed: Thu Mar 3 11:13:34 2016 +0300
----------------------------------------------------------------------
bin/ignite.bat | 7 +-
bin/ignite.sh | 6 +-
.../internal/binary/BinaryEnumObjectImpl.java | 43 +-
.../discovery/GridDiscoveryManager.java | 18 +-
.../internal/processors/cache/CacheObject.java | 3 +
.../processors/cache/GridCacheUtils.java | 13 +
.../binary/CacheObjectBinaryProcessorImpl.java | 3 +-
.../dht/GridDhtPartitionTopologyImpl.java | 12 +-
.../processors/platform/PlatformContext.java | 9 +-
.../platform/PlatformContextImpl.java | 13 +-
.../platform/PlatformProcessorImpl.java | 14 +-
.../platform/compute/PlatformCompute.java | 23 +-
.../utils/PlatformConfigurationUtils.java | 6 +-
.../service/GridServiceProcessor.java | 2 +-
.../processors/service/GridServiceProxy.java | 110 ++--
.../ignite/internal/util/IgniteUtils.java | 39 ++
.../util/StripedCompositeReadWriteLock.java | 164 ++++++
.../tcp/internal/TcpDiscoveryNode.java | 25 +
.../internal/binary/BinaryEnumsSelfTest.java | 51 +-
.../cache/CacheEnumOperationsAbstractTest.java | 32 ++
.../GridCacheOnCopyFlagAbstractSelfTest.java | 32 +-
.../IgniteCacheConfigVariationsFullApiTest.java | 12 +-
...idCacheReplicatedPreloadOffHeapSelfTest.java | 3 +-
.../GridCacheReplicatedPreloadSelfTest.java | 16 +-
.../GridServiceProxyNodeStopSelfTest.java | 105 ++++
.../processors/service/inner/MyService.java | 11 +
.../processors/service/inner/MyServiceImpl.java | 10 +
.../platform/PlatformStartIgniteTask.java | 77 +++
.../ignite/platform/PlatformStopIgniteTask.java | 74 +++
.../ConfigVariationsTestSuiteBuilderTest.java | 18 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 4 +-
.../processors/query/h2/IgniteH2Indexing.java | 8 +
.../cache/CacheQueryNewClientSelfTest.java | 43 +-
.../Apache.Ignite.Core.Tests.csproj | 2 +
.../Binary/BinarySelfTest.cs | 110 ++--
.../Compute/MixedClusterTest.cs | 123 ++++
.../Config/Compute/compute-grid1.xml | 1 -
.../Config/Compute/compute-grid2.xml | 15 +-
.../IgniteConfigurationTest.cs | 17 +-
.../ProjectFilesTest.cs | 94 +++
.../Apache.Ignite.Core.Tests/TestUtils.cs | 33 +-
.../Apache.Ignite.Core.csproj | 2 +-
.../Binary/BinaryReflectiveSerializer.cs | 241 ++++++++
.../Multicast/TcpDiscoveryMulticastIpFinder.cs | 2 +-
.../Impl/Binary/BinaryReflectiveActions.cs | 576 +++++++++++++------
.../Impl/Binary/BinaryReflectiveSerializer.cs | 218 -------
.../Impl/Binary/BinaryWriter.cs | 28 +-
modules/zookeeper/pom.xml | 50 +-
.../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 24 +-
49 files changed, 1930 insertions(+), 612 deletions(-)
----------------------------------------------------------------------