Merge remote-tracking branch 'remotes/origin/master' into ignite-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/aceb5868 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aceb5868 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aceb5868 Branch: refs/heads/ignite-54 Commit: aceb586892adc2bc15756e372677a0edfc49cb83 Parents: 180720f 7f190ca Author: sboikov <sboi...@gridgain.com> Authored: Mon Jan 12 15:05:38 2015 +0400 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jan 12 15:05:38 2015 +0400 ---------------------------------------------------------------------- .../org/apache/ignite/IgniteSystemProperties.java | 13 +++++++++++++ .../spi/communication/tcp/TcpCommunicationSpi.java | 8 +++++--- .../main/java/org/gridgain/grid/util/GridUtils.java | 16 ++++++++++++++++ .../bamboo/GridCacheFailoverTestSuite.java | 3 ++- 4 files changed, 36 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aceb5868/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ----------------------------------------------------------------------
