You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2016/06/17 12:01:30 UTC

[4/4] ignite git commit: Merge branch 'gridgain-7.6.1'

Merge branch 'gridgain-7.6.1'


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

Branch: refs/heads/master
Commit: c61c0cb15bbed457e376bee96967e6714493758e
Parents: 3b69827 106b869
Author: Valentin Kulichenko <va...@gmail.com>
Authored: Fri Jun 17 15:00:47 2016 +0300
Committer: Valentin Kulichenko <va...@gmail.com>
Committed: Fri Jun 17 15:00:47 2016 +0300

----------------------------------------------------------------------
 .../IgniteCacheRandomOperationBenchmark.java    | 539 ++++++++++---------
 .../cache/load/model/key/Identifier.java        |   6 +
 .../yardstick/cache/load/model/key/Mark.java    |   7 +
 .../yardstick/cache/load/model/value/Car.java   |   6 +
 .../yardstick/cache/load/model/value/Truck.java |  12 +-
 .../ignite/yardstick/cache/model/Account.java   |   6 +
 .../ignite/yardstick/cache/model/Person1.java   |   2 +-
 .../ignite/yardstick/cache/model/Person2.java   |   2 +-
 .../ignite/yardstick/cache/model/SampleKey.java |   2 +-
 .../yardstick/cache/model/SampleValue.java      |   2 +-
 .../zk/TcpDiscoveryZookeeperIpFinder.java       |  19 +-
 11 files changed, 321 insertions(+), 282 deletions(-)
----------------------------------------------------------------------