[34/39] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'

2015-08-10 Thread sboikov
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/63944d41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63944d41 Diff: http://git-wip-us.ap

[34/39] incubator-ignite git commit: Merge remote-tracking branch 'origin/master'

2015-07-24 Thread akuznetsov
Merge remote-tracking branch 'origin/master' Conflicts: modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commi