You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/16 16:09:36 UTC
[21/21] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1124
Merge remote-tracking branch 'remotes/origin/master' into ignite-1124
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1e42e39a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e42e39a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e42e39a
Branch: refs/heads/ignite-1124
Commit: 1e42e39ad3bf9512aaebeca7c37847390db372fd
Parents: 57368a1 44043fa
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jul 16 17:06:50 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jul 16 17:06:50 2015 +0300
----------------------------------------------------------------------
assembly/LICENSE_FABRIC | 17 +--
assembly/LICENSE_HADOOP | 11 --
.../src/main/resources/META-INF/licenses.txt.vm | 4 +-
modules/core/licenses/jsr166-license.txt | 3 +
modules/core/licenses/snaptree-bsd-license.txt | 2 +-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 14 +-
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 35 ++++-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 140 ++++++++++++-------
modules/jta/licenses/jta-license.txt | 2 +
10 files changed, 141 insertions(+), 89 deletions(-)
----------------------------------------------------------------------