Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-883
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/58fe3edf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/58fe3edf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/58fe3edf Branch: refs/heads/ignite-883-1 Commit: 58fe3edfdb68fea7b045b3158dbfab9f9228cae7 Parents: de0d61f 4375529 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jun 11 17:42:00 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jun 11 17:42:00 2015 +0300 ---------------------------------------------------------------------- idea/ignite_codeStyle.xml | 147 +++++++++++++++++++ .../apache/ignite/cache/query/ScanQuery.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 38 +---- .../tcp/TcpClientDiscoverySpiSelfTest.java | 114 +++++++++++++- parent/pom.xml | 1 + 5 files changed, 267 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/58fe3edf/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ----------------------------------------------------------------------
