Fixing merge conflicts around adding latency variance tracking Conflicts: core/src/main/java/com/yahoo/ycsb/measurements/OneMeasurementHistogram.java
Description
Description
Details
Details
- Committed
Brian Nixon <b_nixon@apple.com> Nov 26 2015, 03:37 - Pushed
iorgulescu Oct 2 2018, 18:02 - Parents
- R7507:6bed442c0b97: Changing totallatency in OneMeasurementHistogram back to long type.
R7507:0794af45f2b8: Merge pull request #500 from stfeng/datastore-client - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 0794af45f2b8 | Sean Busbey | Merge pull request #500 from stfeng/datastore-client | Nov 25 2015 | |||
| 6373cf9e7a3a | Sean Busbey | Merge pull request #511 from brianfrankcooper/revert-372-master | Nov 25 2015 | |||
| 0e5866eb6079 | Sean Busbey | Revert "added S3 storage binding" | Nov 25 2015 | |||
| 025900d9dc53 | Sean Busbey | Merge pull request #372 from ivanB1975/master | Nov 25 2015 | |||
| a01592acaaca | Stanley Feng | [googledatastore] Add cause to DBException | Nov 25 2015 | |||
| 98b845fd741f | Stanley Feng | [googledatastore] Address latest CR comments @busbey | Nov 23 2015 | |||
| 93ebc1770bc8 | Stanley Feng | [googledatastore] Incorporate CR comments from @kruthar | Nov 23 2015 | |||
| 6d37103559b3 | Stanley Feng | [googledatastore] Add note that scan is not implemented yet | Nov 19 2015 | |||
| 58f1ecb40789 | Stanley Feng | [googledatastore] Support entity-grouping mode | Nov 18 2015 | |||
| 8cc2a64132de | Stanley Feng | [googledatastore] Initial commit of the Google Datastore Client | Nov 15 2015 | |||
| 0eb982ddd221 | allanbank | Merge pull request #482 from allanbank/elasticsearch-cleanup | Nov 14 2015 | |||
| 7ff341657911 | allanbank | Merge pull request #490 from allanbank/redis-cleanup | Nov 14 2015 | |||
| 8c9cf628d85c | allanbank | Merge pull request #492 from allanbank/voldemort-cleanup | Nov 14 2015 | |||
| 7a74d13a9729 | Connor McCoy | Merge pull request #499 from kruthar/verify-readall | Nov 14 2015 | |||
| 3e1a451dc0db | Andy Kruth | [core] passing full fieldset for verification | Nov 13 2015 | |||
| 1206bc8ab696 | Connor McCoy | Merge pull request #498 from kruthar/verify-reporting | Nov 13 2015 | |||
| d6e37c253413 | Connor McCoy | Merge pull request #497 from kruthar/jdbc-semicolons | Nov 13 2015 | |||
| 05d00f35dfaf | Andy Kruth | [core] replaced tabs with spaces | Nov 13 2015 | |||
| 9b2d8fbcfe62 | Andy Kruth | [core] added return codes to VERIFY | Nov 13 2015 | |||
| 4b1d40f16063 | Andy Kruth | [jdbc] removed semicolons from cached statements | Nov 13 2015 | |||
| 4e7295c213d5 | allanbank | Merge pull request #488 from allanbank/kudu-cleanup | Nov 12 2015 | |||
| add8e70b0045 | allanbank | Merge pull request #485 from allanbank/hbase10-cleanup | Nov 11 2015 | |||
| fd3bc7d8f6b0 | Robert J. Moore | [hbase10] Checkstyle updates for HBase 1.0 binding. | Nov 10 2015 | |||
| ce3edbfd0b06 | Robert J. Moore | [voldemort] Update binding to use the new Status class and also checkstyle… | Nov 9 2015 | |||
| 52598143ca9a | Robert J. Moore | [redis] Checkstyle updates for the Redis binding. | Nov 9 2015 | |||
| 23f8f3002715 | Robert J. Moore | [kudu] Checkstyle updates for the Kudu binding. | Nov 9 2015 | |||
| bcae0005026a | Robert J. Moore | [elasticsearch] Checkstyle updates for Elasticsearch. | Nov 8 2015 | |||
| 92c69c55bb8c | Connor McCoy | Merge branch 'missing-licence' | Nov 6 2015 | |||
| a3586e47649f | Connor McCoy | Merge #477: DynamoDB improvement | Nov 5 2015 | |||
| 1238a4f865c2 | Stanley Feng/Connor McCoy | [dynamodb] Some minor styling fix. | Nov 5 2015 | |||
| 36d18d42ae82 | Stanley Feng/Connor McCoy | [dynamodb] Add HASH_AND_RANGE primary key type | Nov 5 2015 | |||
| 0d7c07dc2f64 | Connor McCoy | Merge pull request #475 from kruthar/jdbc-testing | Nov 5 2015 | |||
| 5ff4608fb87b | kruthar | [jdbc] testing code cleanup | Nov 5 2015 | |||
| 22085f6256ea | kruthar | [jdbc] implemented base operation test cases | Nov 5 2015 | |||
| f69e31003287 | kruthar | [jdbc] added junit testing stubs for jdbc-binding | Nov 5 2015 | |||
| a0527af58f83 | Connor McCoy | [license] Apply results of Apache Rat check | Nov 4 2015 | |||
| b116ee5a7806 | Connor McCoy | [version] update master to 0.6.0-SNAPSHOT. | Nov 4 2015 | |||
| fd29cda72cdc | allanbank | Merge pull request #474 from allanbank/fix-post-461-build | Nov 4 2015 | |||
| cadd7d58548b | Robert J. Moore | [core] Fix the build post the #461 merge. | Nov 4 2015 | |||
| 624033b0773a | allanbank | Merge pull request #461 from stfeng/master | Nov 4 2015 | |||
| 5d0aba395acd | Connor McCoy | Merge pull request #469 from cmccoy/status-codes | Nov 4 2015 | |||
| 04bbc38c496f | Connor McCoy | Merge pull request #473 from kruthar/jdbc-fields-fix | Nov 3 2015 | |||
| ef3333685971 | kruthar | [jdbc] update all documentation starting at field0 | Nov 3 2015 | |||
| e1c8bec0032b | kruthar | [jdbc] change update field set to start at field0 | Nov 3 2015 | |||
| 8bfadaeafce7 | Stanley Feng | Incorporate CR feedback: | Nov 3 2015 | |||
| 5113c2e3d251 | Connor McCoy | StatusCode -> Status | Nov 3 2015 | |||
| 28a090a729d2 | Connor McCoy | Add single definition of status codes | Nov 3 2015 | |||
| 65bedc061626 | Connor McCoy | Merge pull request #468 from kruthar/jdbc-scan-fix | Nov 3 2015 | |||
| d01e35cee254 | Connor McCoy | Merge pull request #470 from elliottneilclark/tarLong | Nov 3 2015 | |||
| d6b1ebc65a38 | allanbank | Merge pull request #465 from allanbank/accumulo-readme | Nov 3 2015 |
