Merge remote-tracking branch 'remotes/origin/ignite-1157' into ignite-1.3.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d747d2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d747d2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d747d2a Branch: refs/heads/ignite-104 Commit: 7d747d2aca6bdee21ca1c300b17d9cad709f38a2 Parents: 015d9cd a1543cf Author: sevdokimov <sevdoki...@gridgain.com> Authored: Mon Aug 3 16:21:04 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Mon Aug 3 16:21:04 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/util/GridLogThrottle.java | 63 +++++++++++++++----- .../ignite/spi/discovery/tcp/ClientImpl.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 15 +++++ 4 files changed, 70 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
