Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-964-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/f9a738f3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9a738f3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9a738f3 Branch: refs/heads/ignite-964 Commit: f9a738f3e3aa4370a7302512bdd149a2984e6ae5 Parents: b963d03 c7e7487 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Jul 1 12:08:12 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Jul 1 12:08:12 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 105 ++++++++++--------- .../configuration/NearCacheConfiguration.java | 10 +- .../managers/communication/GridIoManager.java | 49 +++++---- .../discovery/GridDiscoveryManager.java | 26 +---- .../processors/clock/GridClockServer.java | 21 +++- .../util/nio/GridNioMessageTracker.java | 23 +++- .../ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../TcpDiscoveryMulticastIpFinder.java | 74 ++++++++++--- .../IgniteTopologyPrintFormatSelfTest.java | 60 ++++++++++- modules/docker/Dockerfile | 55 ++++++++++ modules/docker/README.txt | 11 ++ modules/docker/build_users_libs.sh | 39 +++++++ modules/docker/download_ignite.sh | 49 +++++++++ modules/docker/execute.sh | 62 +++++++++++ modules/docker/run.sh | 34 ++++++ 15 files changed, 497 insertions(+), 123 deletions(-) ----------------------------------------------------------------------
