Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-973
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bcfbb923 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bcfbb923 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bcfbb923 Branch: refs/heads/ignite-yardstick-client Commit: bcfbb9236e860115dfc70da9f717aaba7cb9544c Parents: 23512df d699faa Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Jun 19 13:31:39 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Jun 19 13:31:39 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 42 +++++++++---------- .../ignite/spi/discovery/tcp/ServerImpl.java | 35 ++++++++++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 +++++++++++++------ .../tcp/internal/TcpDiscoveryNode.java | 18 ++++++++ .../core/src/main/resources/ignite.properties | 2 +- .../apache/ignite/internal/GridSelfTest.java | 20 +++++---- .../DataStreamerMultiThreadedSelfTest.java | 3 ++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 44 ++++++++++++++++++-- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 44 files changed, 189 insertions(+), 89 deletions(-) ----------------------------------------------------------------------
