Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BBF3418F5E for ; Thu, 26 Nov 2015 12:09:26 +0000 (UTC) Received: (qmail 75771 invoked by uid 500); 26 Nov 2015 12:09:26 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 75685 invoked by uid 500); 26 Nov 2015 12:09:26 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 75656 invoked by uid 99); 26 Nov 2015 12:09:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Nov 2015 12:09:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57AFCE0991; Thu, 26 Nov 2015 12:09:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Thu, 26 Nov 2015 12:09:29 -0000 Message-Id: <115bfa4239ab4f0aabd59614de42b6bd@git.apache.org> In-Reply-To: <12e060c328e848b99847fa4d45da66f5@git.apache.org> References: <12e060c328e848b99847fa4d45da66f5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/7] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5 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-1956 Commit: dae1b87af17abd83d072beb11243976bac943b2a Parents: 4976361 e8a14da Author: Alexey Goncharuk Authored: Thu Nov 26 13:25:18 2015 +0300 Committer: Alexey Goncharuk 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(-) ----------------------------------------------------------------------