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 2015/12/09 15:17:07 UTC
[5/5] ignite git commit: Merge branch 'ignite-1.5' into ignite-2099
Merge branch 'ignite-1.5' into ignite-2099
Conflicts:
modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinarySystemHandlers.cs
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1c8208e0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1c8208e0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1c8208e0
Branch: refs/heads/ignite-2099
Commit: 1c8208e0dc3217a98ce22cace4bc7e20c25a0f4a
Parents: 7d73415 6791c50
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Dec 9 17:17:56 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Dec 9 17:17:56 2015 +0300
----------------------------------------------------------------------
assembly/release-fabric-base.xml | 13 --
.../GridTransactionalCacheQueueImpl.java | 32 +++--
...eAbstractDataStructuresFailoverSelfTest.java | 138 +++++++++++++++----
.../Cache/Query/IQueryCursor.cs | 2 +-
.../Apache.Ignite.Core/Cache/Query/QueryBase.cs | 2 +-
.../Store/CacheParallelLoadStoreAdapter.cs | 4 +-
.../Cache/Store/CacheStoreAdapter.cs | 12 +-
.../Cache/Store/ICacheStore.cs | 36 ++---
.../Apache.Ignite.Core/Cluster/ICluster.cs | 2 +-
.../Cluster/IClusterMetrics.cs | 6 +-
.../Apache.Ignite.Core/Cluster/IClusterNode.cs | 6 +-
.../Apache.Ignite.Core/Compute/IComputeTask.cs | 2 +-
.../Datastream/IDataStreamer.cs | 12 +-
.../Apache.Ignite.Core/Events/CacheEvent.cs | 4 +-
.../Apache.Ignite.Core/Events/TaskEvent.cs | 2 +-
.../dotnet/Apache.Ignite.Core/IIgnite.cs | 6 +-
.../dotnet/Apache.Ignite.Core/Ignition.cs | 24 ++--
.../Impl/Binary/BinaryObjectHeader.cs | 10 +-
.../Impl/Binary/BinaryUtils.cs | 1 -
.../Impl/Binary/Metadata/BinaryTypeHolder.cs | 1 +
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 2 -
.../Transactions/ITransaction.cs | 2 +-
modules/platforms/dotnet/Apache.Ignite.slnrel | 43 ------
.../platforms/dotnet/Apache.Ignite_x86.slnrel | 43 ------
modules/platforms/dotnet/README.txt | 36 +++--
modules/platforms/dotnet/examples/README.txt | 8 --
parent/pom.xml | 2 +
27 files changed, 221 insertions(+), 230 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1c8208e0/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryUtils.cs
----------------------------------------------------------------------