Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite 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/dae1b87a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dae1b87a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dae1b87a Branch: refs/heads/ignite-1.5-cache-get-opts Commit: dae1b87af17abd83d072beb11243976bac943b2a Parents: 4976361 e8a14da Author: Alexey Goncharuk <[email protected]> Authored: Thu Nov 26 13:25:18 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Nov 26 13:25:18 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 +- .../internal/processors/cache/GridCacheMessage.java | 1 + .../processors/cache/portable/IgniteBinaryImpl.java | 9 +++++---- .../internal/processors/cacheobject/NoOpBinary.java | 8 ++++---- .../portable/BinaryObjectBuilderAdditionalSelfTest.java | 6 +++--- .../internal/portable/GridPortableMetaDataSelfTest.java | 10 +++++----- .../cache/distributed/IgniteCacheSizeFailoverTest.java | 7 +++++++ ...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 +++++++-- 14 files changed, 50 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
