Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8a14dab Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8a14dab Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8a14dab Branch: refs/heads/ignite-1.5-cache-get-opts Commit: e8a14dabe0029e3ff6a4be4e49f409c73e304f9a Parents: be505f4 e386798 Author: sboikov <[email protected]> Authored: Thu Nov 26 12:56:04 2015 +0300 Committer: sboikov <[email protected]> Committed: Thu Nov 26 12:56:04 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/IgniteBinary.java | 10 +++++----- .../main/java/org/apache/ignite/binary/BinaryObject.java | 2 +- .../main/java/org/apache/ignite/binary/BinaryType.java | 2 +- .../processors/cache/portable/IgniteBinaryImpl.java | 9 +++++---- .../internal/processors/cacheobject/NoOpBinary.java | 8 ++++---- .../portable/BinaryObjectBuilderAdditionalSelfTest.java | 6 +++--- .../internal/portable/GridPortableMetaDataSelfTest.java | 10 +++++----- ...dCacheClientNodeBinaryObjectMetadataMultinodeTest.java | 8 ++++---- .../GridCacheClientNodeBinaryObjectMetadataTest.java | 4 ++-- .../platform/PlatformComputeBinarizableArgTask.java | 2 +- .../Apache.Ignite.Core.Tests/Examples/ExamplesTest.cs | 5 ++++- .../Apache.Ignite.Examples/Messaging/MessagingExample.cs | 9 +++++++-- 12 files changed, 42 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
