Merge branch 'ignite-45' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8eb79a74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8eb79a74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8eb79a74 Branch: refs/heads/ignite-45 Commit: 8eb79a74d4930f479b4a44590b1075395f8033e9 Parents: d57374e 852b035 Author: ivasilinets <[email protected]> Authored: Thu Mar 19 18:21:37 2015 +0300 Committer: ivasilinets <[email protected]> Committed: Thu Mar 19 18:21:37 2015 +0300 ---------------------------------------------------------------------- .../affinity/AffinityTopologyVersion.java | 6 +----- .../cache/GridCachePartitionExchangeManager.java | 16 +++++++--------- .../preloader/GridDhtPartitionsExchangeFuture.java | 6 +++++- .../apache/ignite/internal/util/lang/GridFunc.java | 2 +- .../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++------- 5 files changed, 16 insertions(+), 23 deletions(-) ----------------------------------------------------------------------
