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 A96A1182B5 for ; Fri, 19 Jun 2015 14:45:20 +0000 (UTC) Received: (qmail 79699 invoked by uid 500); 19 Jun 2015 14:45:20 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 79664 invoked by uid 500); 19 Jun 2015 14:45:20 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 79655 invoked by uid 99); 19 Jun 2015 14:45:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 14:45:20 +0000 X-ASF-Spam-Status: No, hits=-2000.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 19 Jun 2015 14:43:09 +0000 Received: (qmail 77239 invoked by uid 99); 19 Jun 2015 14:44:56 -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; Fri, 19 Jun 2015 14:44:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2BEFCE091F; Fri, 19 Jun 2015 14:44:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 19 Jun 2015 14:44:57 -0000 Message-Id: <892eb33843bd4b838163e34af3c42dd6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/50] incubator-ignite git commit: Merge branch 'ignite-gg-10429' into ignite-sprint-6 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-gg-10429' into ignite-sprint-6 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f173f913 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f173f913 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f173f913 Branch: refs/heads/ignite-917 Commit: f173f9132eac1b7f8ac31bad795f0694be9a3c14 Parents: d1a2150 01eee2d Author: nikolay_tikhonov Authored: Wed Jun 17 12:33:13 2015 +0300 Committer: nikolay_tikhonov Committed: Wed Jun 17 12:33:13 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 13 +----------- .../client/GridClientConfiguration.java | 4 ++-- .../GridClientOptimizedMarshaller.java | 21 ++++++++++++++++++++ .../impl/GridTcpRouterNioListenerAdapter.java | 2 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 3 ++- .../ignite/internal/util/IgniteUtils.java | 21 ++++++++++++++++++++ 6 files changed, 48 insertions(+), 16 deletions(-) ----------------------------------------------------------------------