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/27 15:57:03 UTC
[6/6] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1139
Merge remote-tracking branch 'remotes/origin/master' into ignite-1139
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ed8dac68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ed8dac68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ed8dac68
Branch: refs/heads/ignite-1139
Commit: ed8dac68bb008c17246ecea5169b34a55b860869
Parents: 6f915db a127756
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Jul 27 16:56:39 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Jul 27 16:56:39 2015 +0300
----------------------------------------------------------------------
.../rest/AbstractRestProcessorSelfTest.java | 1 +
.../JettyRestProcessorAbstractSelfTest.java | 657 ++++++++++++++++++-
.../apache/ignite/internal/IgniteKernal.java | 42 +-
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/rest/GridRestCommand.java | 53 +-
.../processors/rest/GridRestProcessor.java | 32 +
.../handlers/cache/GridCacheCommandHandler.java | 373 ++++++++++-
.../query/CacheQueryFieldsMetaResult.java | 133 ++++
.../rest/handlers/query/CacheQueryResult.java | 120 ++++
.../handlers/query/QueryCommandHandler.java | 292 +++++++++
.../version/GridVersionCommandHandler.java | 14 +-
.../rest/request/RestSqlQueryRequest.java | 125 ++++
.../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +-
.../gce/TcpDiscoveryGoogleStorageIpFinder.java | 18 +
...pDiscoveryGoogleStorageIpFinderSelfTest.java | 29 +-
.../http/jetty/GridJettyRestHandler.java | 85 ++-
modules/yardstick/config/benchmark.properties | 6 +-
.../yardstick/IgniteBenchmarkArguments.java | 22 +
.../yardstick/cache/IgnitePutAllBenchmark.java | 67 ++
.../cache/IgnitePutAllTxBenchmark.java | 68 ++
20 files changed, 2060 insertions(+), 81 deletions(-)
----------------------------------------------------------------------