Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-1043
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c516679a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c516679a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c516679a Branch: refs/heads/ignite-1043 Commit: c516679a427e10869539ebec82c65b6bed29248b Parents: 7aaa85f de0930d Author: ivasilinets <[email protected]> Authored: Mon Jun 22 14:11:37 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Mon Jun 22 14:11:37 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 3 ++ .../communication/tcp/TcpCommunicationSpi.java | 49 ++++++++++---------- .../tcp/TcpCommunicationSpiMBean.java | 8 ++++ .../ignite/spi/discovery/tcp/ClientImpl.java | 23 +++++++++ .../cache/IgniteCacheOffheapEvictQueryTest.java | 17 +++++++ 5 files changed, 76 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
