Merge branch 'ignite-961' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c51381ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c51381ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c51381ec Branch: refs/heads/ignite-843 Commit: c51381ec46785bf7a599c336001badcd70344bdf Parents: 49bf1e2 216d4ff Author: Andrey <anovi...@gridgain.com> Authored: Tue Jul 28 11:02:22 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Jul 28 11:02:22 2015 +0700 ---------------------------------------------------------------------- .../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +- .../gce/TcpDiscoveryGoogleStorageIpFinder.java | 18 ++++++ ...pDiscoveryGoogleStorageIpFinderSelfTest.java | 29 ++++++++- modules/nodejs/src/main/js/cache.js | 30 +++++++-- .../ignite/internal/NodeJsSqlQuerySelfTest.java | 9 +++ modules/nodejs/src/test/js/test-query.js | 53 ++++++++++++++- modules/yardstick/config/benchmark.properties | 6 +- .../yardstick/IgniteBenchmarkArguments.java | 22 +++++++ .../yardstick/cache/IgnitePutAllBenchmark.java | 67 +++++++++++++++++++ .../cache/IgnitePutAllTxBenchmark.java | 68 ++++++++++++++++++++ 10 files changed, 296 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
