ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [6/7] ignite git commit: Merge branch 'master' into ignite-2926
Date Tue, 19 Apr 2016 13:09:02 GMT
Merge branch 'master' into ignite-2926


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5646ef0d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5646ef0d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5646ef0d

Branch: refs/heads/ignite-2926
Commit: 5646ef0d19abe3d25528dd4835aeea48b7c1198d
Parents: 3f2450d 186c860
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Tue Apr 19 13:52:42 2016 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Tue Apr 19 13:52:42 2016 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/Ignition.java   |  19 +-
 .../configuration/ConnectorConfiguration.java   |   3 +
 .../configuration/IgniteConfiguration.java      |   3 +
 .../org/apache/ignite/internal/IgnitionEx.java  |  60 +++-
 .../processors/clock/GridClockServer.java       |   3 +-
 .../rest/protocols/tcp/GridTcpRestProtocol.java |   7 +-
 .../communication/tcp/TcpCommunicationSpi.java  |   4 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  32 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   2 +
 .../ignite/internal/GridGetOrStartSelfTest.java | 132 +++++++
 .../GridTcpCommunicationSpiConfigSelfTest.java  |  22 ++
 .../tcp/TcpDiscoverySpiConfigSelfTest.java      |  22 ++
 .../ignite/testsuites/IgniteBasicTestSuite.java |   3 +
 .../IgniteBinaryCacheQueryTestSuite.java        |   1 -
 .../http/jetty/GridJettyRestProtocol.java       |   4 +-
 .../org/apache/ignite/spark/IgniteContext.scala |  73 ++--
 .../apache/ignite/spark/JavaIgniteContext.scala |  14 +-
 .../spark/JavaEmbeddedIgniteRDDSelfTest.java    | 343 +++++++++++++++++++
 .../ignite/spark/JavaIgniteRDDSelfTest.java     | 302 ----------------
 .../spark/JavaStandaloneIgniteRDDSelfTest.java  | 302 ++++++++++++++++
 .../ignite/testsuites/IgniteRDDTestSuite.java   |  40 +++
 .../ignite/cache/websession/WebSession.java     |   7 +-
 .../internal/websession/WebSessionSelfTest.java |  88 ++++-
 .../config/benchmark-cache-load-win.properties  |   2 +-
 .../config/benchmark-cache-load.properties      |  53 ++-
 .../config/ignite-base-load-config.xml          | 256 ++++++++++++++
 .../config/ignite-cache-load-config.xml         |  70 ++++
 .../IgniteCacheRandomOperationBenchmark.java    | 176 +++++++++-
 .../yardstick/cache/load/model/ModelUtil.java   |   2 +-
 29 files changed, 1652 insertions(+), 393 deletions(-)
----------------------------------------------------------------------



Mime
View raw message