Merge branches 'ignite-484-1' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b8587ba Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b8587ba Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b8587ba Branch: refs/heads/ignite-gg-10411 Commit: 0b8587ba81400a5227e8d3bb8be52f8c0d7d179f Parents: c1fc7b5 5218210 Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Jun 17 14:40:23 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Jun 17 14:40:23 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 13 +----------- .../client/GridClientConfiguration.java | 2 +- .../GridClientOptimizedMarshaller.java | 21 ++++++++++++++++++++ .../impl/GridTcpRouterNioListenerAdapter.java | 2 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 3 ++- .../ignite/internal/util/IgniteUtils.java | 21 ++++++++++++++++++++ 6 files changed, 47 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
