Merge remote-tracking branch 'upstream/master' into splitrun
Conflicts:
core/src/main/java/com/yahoo/ycsb/workloads/CoreWorkload.java
fixed conflict, fixed extra spaces and space between methods
Description
Description
Details
Details
- Committed
danielpoltx <daniel.pol@hpe.com> Apr 21 2016, 15:00 - Pushed
iorgulescu Oct 2 2018, 18:02 - Parents
- R7507:4c14276573a6: Merge pull request #720 from jdcryans/master
R7507:45e8f7373e08: added additional zeropadding info, fixed formatting - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 4c14276573a6 | Sean Busbey | Merge pull request #720 from jdcryans/master | Apr 20 2016 | |||
| a9e0f49fd0be | Jean-Daniel Cryans | [kudu] Add instructions on how to change the client version | Apr 20 2016 | |||
| f66bb1484b05 | Jean-Daniel Cryans | [kudu] Use the new KuduPredicate API | Apr 19 2016 | |||
| d77c07602732 | Jean-Daniel Cryans | [kudu] Upgrade client dependency to Kudu 0.8.0 | Apr 19 2016 | |||
| 81f6f146fe21 | Sean Busbey | Merge pull request #682 from yuyantingzero/master | Apr 19 2016 | |||
| 2cc1414b1299 | yuyanting | [googledatastore] Clean up googledatastore/pom file. | Apr 18 2016 | |||
| 9e922c9e77f2 | Sean Busbey | Merge pull request #718 from manolama/asynchbase | Apr 18 2016 | |||
| 49b92dc7a2ed | Chris Larsen | [asynchbase] Fix Netty library version issue that prevents it from loading… | Apr 18 2016 | |||
| 02d7a4e6b50c | Sean Busbey | Merge pull request #714 from manolama/asynchbase | Apr 18 2016 | |||
| b6ae89901e4d | Chris Larsen | [asynchbase] Add AsyncHBase as an alternative to the default HBase client. Note… | Apr 17 2016 | |||
| 0f92f7525b29 | Sean Busbey | Merge pull request #694 from manolama/stringgen | Apr 17 2016 | |||
| ede6f2f8aabb | Chris Larsen | [core] Add an incrementing printable string generator. This will be used for… | Apr 16 2016 | |||
| 4e37e502d086 | Sean Busbey | Merge pull request #686 from nygard89/master | Apr 16 2016 | |||
| 3609a94d9dee | Sean Busbey | Merge pull request #696 from manolama/operation_generator | Apr 16 2016 | |||
| 5fd5f1a9d530 | Sean Busbey | Merge pull request #711 from couchbaselabs/couchbase2 | Apr 16 2016 | |||
| 465fb7efa00d | nygard_89 | [riak] R, W, etc. options are ignored for strong-consistent updates. So, it's… | Apr 15 2016 | |||
| d6e767a700ce | nygard89 | [riak] Fixed formatting errors in README.md. | Apr 15 2016 | |||
| 3891efc686b9 | nygard_89 | [riak] Set strong consistency as default consistency model. | Apr 15 2016 | |||
| e8394b2afb1d | Michael Nitschinger | [couchbase2] Allow to log latency & runtime metrics. | Apr 15 2016 | |||
| 5ded6ede6fb8 | nygard_89 | Merge remote-tracking branch 'origin/master' | Apr 14 2016 | |||
| c353f7120a14 | nygard_89 | [travis] Reverted to original version, just added riak as service. [riak]… | Apr 14 2016 | |||
| d4d251a07abb | nygard_89 | [travis] Added sudo requirement for running riak-admin commands. [travis] Added… | Apr 14 2016 | |||
| 5661a00012e4 | nygard_89 | [riak] Fixed RiakKVClient.java which didn't read props from command line. | Apr 14 2016 | |||
| 19bc1e0ce3aa | nygard_89 | [riak] Fixed README.md file. | Apr 13 2016 | |||
| d20917596333 | nygard_89 | [travis] Added Riak service for testing purposes. [riak] Added test unit. | Apr 13 2016 | |||
| 8b4f38745a26 | yuyanting | [googledatastore] Update googledatastore artifacts. | Apr 13 2016 | |||
| 776ec892ff30 | nygard_89 | [riak] Changed FetchValue.Option in update() transaction function. | Apr 12 2016 | |||
| 122b5b598a64 | nygard_89 | [riak] Modified Riak package reference in bin/ycsb file. [riak] Done some… | Apr 12 2016 | |||
| 2797f9a02649 | nygard_89 | [riak] Removed test unit as it only works with a local cluster installation… | Apr 12 2016 | |||
| 1ff7e2b8fbc7 | nygard_89 | [riak] Added test unit. | Apr 10 2016 | |||
| a0f9010fa06a | Chris Larsen | [core] Add CoreWorkload.createOperationGenerator() for use in other workloads. | Apr 10 2016 | |||
| 6ea3666bf5f6 | nygard89 | Update README.md | Apr 9 2016 | |||
| 749250049734 | nygard_89 | [riak] New YCSB binding for Riak. The binding is based on the one created by… | Apr 9 2016 | |||
| ad34f6f227f9 | nygard_89 | Merge remote-tracking branch 'origin/master' | Apr 8 2016 | |||
| ee0534d46290 | yuyanting | [googledatastore] Improve README.md. | Apr 7 2016 | |||
| 9b207cd5d3df | yuyanting | [googledatastore] Address code review comments. | Apr 7 2016 | |||
| ba72c9a34213 | nygard_89 | Added new binding for Riak, based on the one created by Basho Technologies… | Apr 6 2016 | |||
| 94e5d6fd1e9e | yuyanting | [googledatastore] Update README.md for googledatastore. | Apr 6 2016 | |||
| 445c89594785 | yuyanting | [googledatastore] Update googledatastore API version to v1beta3. | Apr 5 2016 |