Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-sql-cache-stmt
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8a3770e3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8a3770e3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8a3770e3 Branch: refs/heads/ignite-sql-opt-2 Commit: 8a3770e3ae4914afb6b26dfd5ad87e99062a661a Parents: 7e34cec c23cda1 Author: sboikov <[email protected]> Authored: Tue Nov 24 16:41:01 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Nov 24 16:41:01 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- .../java/org/apache/ignite/IgniteBinary.java | 6 +---- .../apache/ignite/binary/BinaryIdMapper.java | 2 +- .../apache/ignite/binary/BinarySerializer.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 | 23 +++++++++++++---- .../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 ++ 19 files changed, 80 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
