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 43ABB17C4C for ; Thu, 18 Jun 2015 10:17:05 +0000 (UTC) Received: (qmail 77274 invoked by uid 500); 18 Jun 2015 10:17:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 77244 invoked by uid 500); 18 Jun 2015 10:17:05 -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 77235 invoked by uid 99); 18 Jun 2015 10:17:05 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jun 2015 10:17:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id A6CA6CEB40 for ; Thu, 18 Jun 2015 10:17:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.532 X-Spam-Level: X-Spam-Status: No, score=0.532 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RP_MATCHES_RCVD=-0.269, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 9QQF7g9klqM0 for ; Thu, 18 Jun 2015 10:16:51 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 616CD4E5DC for ; Thu, 18 Jun 2015 10:16:41 +0000 (UTC) Received: (qmail 75238 invoked by uid 99); 18 Jun 2015 10:16:40 -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, 18 Jun 2015 10:16:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95CD7E3CA0; Thu, 18 Jun 2015 10:16:40 +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: Thu, 18 Jun 2015 10:17:03 -0000 Message-Id: <632833a79b41402cb754de2eb906d6e9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [24/50] incubator-ignite git commit: Merge branch 'ignite-gg-10429' into ignite-sprint-6 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-review 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(-) ----------------------------------------------------------------------