You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/11/26 14:13:53 UTC
[11/43] ignite git commit: Merge branch ignite-1.5 into ignite-1282
Merge branch ignite-1.5 into ignite-1282
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6dc6ffe1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6dc6ffe1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6dc6ffe1
Branch: refs/heads/ignite-1.5-cache-get-opts
Commit: 6dc6ffe12d6587a2b8b1dcc497828f16be45aa19
Parents: e52b267 eee3b21
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Nov 24 12:39:07 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Nov 24 12:39:07 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteBinary.java | 2 +-
.../internal/portable/BinaryTypeImpl.java | 4 ++-
.../processors/cache/CacheObjectContext.java | 26 +++++++++++++++---
.../datastructures/GridCacheAtomicLongImpl.java | 6 +++-
.../portable/BinaryMarshallerSelfTest.java | 6 ++--
.../examples/project/vs/ignite-examples.vcxproj | 6 ++--
.../Apache.Ignite.Benchmarks.csproj | 3 ++
.../Apache.Ignite.Core.Tests.TestDll.csproj | 2 ++
.../Apache.Ignite.Core.Tests.csproj | 2 ++
.../Continuous/ContinuousQueryAbstractTest.cs | 29 ++++++++++++--------
.../Apache.Ignite.Core.csproj | 2 ++
.../Apache.Ignite.Core/Impl/Events/Events.cs | 8 ++++--
modules/platforms/dotnet/Apache.Ignite.sln | 6 ++--
.../dotnet/Apache.Ignite/Apache.Ignite.csproj | 2 ++
.../Apache.Ignite.Examples.csproj | 2 ++
.../Apache.Ignite.ExamplesDll.csproj | 2 ++
16 files changed, 77 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6dc6ffe1/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6dc6ffe1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6dc6ffe1/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
----------------------------------------------------------------------