Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-1020
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e507f030 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e507f030 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e507f030 Branch: refs/heads/ignite-1003-debug Commit: e507f030998c98851f97affa14667b64ebdb236e Parents: a75b868 01eee2d Author: sboikov <sboi...@gridgain.com> Authored: Wed Jun 17 12:10:41 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Jun 17 12:10:41 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(-) ----------------------------------------------------------------------
