You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/19 16:44:57 UTC
[02/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
Commit: f173f9132eac1b7f8ac31bad795f0694be9a3c14
Parents: d1a2150 01eee2d
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Wed Jun 17 12:33:13 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
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(-)
----------------------------------------------------------------------