Merge remote-tracking branch 'upstream/master'
Conflicts:
gemfire/pom.xml
gemfire/src/main/java/com/yahoo/ycsb/db/GemFireClient.java
pom.xml
Description
Description
Details
Details
- Committed
Swapnil Bawaskar <sbawaskar@pivotal.io> Aug 14 2015, 02:49 - Pushed
iorgulescu Oct 2 2018, 18:02 - Parents
- R7507:fcf9fdbdc99a: Merge pull request #383 from gkamat/0.3.0-release-cleanup
R7507:be6e40931e33: - removed an extra "/" from the repo url that was preventing maven from finding… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| fcf9fdbdc99a | gkamat | Merge pull request #383 from gkamat/0.3.0-release-cleanup | Aug 12 2015 | |||
| 13cff346a933 | Govind Kamat | [docs] update README for 0.3.0 release. | Aug 12 2015 | |||
| 4e7b32ace67c | gkamat | Merge pull request #382 from gkamat/issue_313 | Aug 7 2015 | |||
| 25502287c5c7 | Govind Kamat | [licensing] Added ASLv2 headers to files without them. | Aug 7 2015 | |||
| 918b155ed124 | Sean Busbey | Merge pull request #381 from nitsanw/master | Aug 6 2015 | |||
| ff562cee1ee2 | nitsanw | [core] Fix recorder/logger initialization timing issue. | Aug 6 2015 | |||
| 593c2625fa8d | gkamat | Merge pull request #366 from allanbank/pr-365 | Jul 24 2015 | |||
| 472beb38d253 | Robert J. Moore | [mongodb] Update the pom.xml to make checkstyle fail the build. Updated code to… | Jul 22 2015 | |||
| deba06be6a8f | gkamat | Merge pull request #362 from allanbank/pr-344 | Jul 22 2015 | |||
| 0d258d61c193 | allanbank | Merge pull request #357 from bigbes/master | Jul 19 2015 | |||
| 4d270b6880ab | allanbank | Merge pull request #359 from allanbank/pr-316 | Jul 18 2015 | |||
| e80aa6e6f30f | Sean Busbey/Robert J. Moore | [client] Add estimated time remaining to status messages. closes #239. | Jul 18 2015 | |||
| 935efc6458b0 | Govind Kamat | [version] update master to 0.4.0-SNAPSHOT. | Jul 18 2015 | |||
| dcd885fb99dc | Robert J. Moore | [client] Standardize on two spaces for whitespace in Client.java. | Jul 18 2015 | |||
| bf13e8153bc2 | Robert J. Moore | [client] Update the client status thread to detect the client (worker) thread… | Jul 18 2015 | |||
| 1efad2f67588 | Robert J. Moore | [mongodb] Update the MongoDB driver version to 3.0.3. | Jul 17 2015 | |||
| 2c83327fb085 | Robert J. Moore | Merge branch 'jyemin-MongoDbClientCleanup' | Jul 17 2015 | |||
| e28ec24e5922 | Jeff Yemin/Robert J. Moore | In order to get the tests to pass again, reverted MongoDbClient to use update… | Jul 17 2015 | |||
| 05baf982743f | Jeff Yemin/Robert J. Moore | Added journal=true back into MongoDB connection string. For now, the… | Jul 17 2015 | |||
| d48f1ce998be | Jeff Yemin/Robert J. Moore | Renamed INSERT_MANY_OPTIONS to INSERT_UNORDERED | Jul 17 2015 | |||
| c5ff3bf6472e | Jeff Yemin/Robert J. Moore | Ensure capacity in results for MongoDBClient.scan | Jul 17 2015 | |||
| 8ae0bd30aaa8 | Jeff Yemin/Robert J. Moore | A bit more cleanup of scan and read in MongoDbClient | Jul 17 2015 | |||
| 00f0a91ba263 | Jeff Yemin/Robert J. Moore | Simplified setting of read preference and write concern in MongoDbClient | Jul 17 2015 | |||
| bac8b695890f | Jeff Yemin/Robert J. Moore | Cleaned up CRUD code for MongoDbClient to improve readability. Simplified… | Jul 17 2015 | |||
| 170b660b43e2 | Jeff Yemin/Robert J. Moore | Fixed incorrect creation of MongoDB URL for mongodb.writeConcern of journaled. | Jul 17 2015 | |||
| 808907d0ab40 | Jeff Yemin/Robert J. Moore | Changed visibility of static field from protected to private in final… | Jul 17 2015 | |||
| 6a0d00d7f864 | Sean Busbey | Merge pull request #360 from jixuan1989/track_official_new | Jul 16 2015 | |||
| 9e913b799b5b | sainthxd@gmail.com | change the port of Cassandra (previous version 1.2) as a parameter instead of a… | Jul 16 2015 | |||
| a9bc84c46e27 | bigbes | Fix codestyle in measurements section of code | Jul 15 2015 | |||
| 2d6185ee331d | bigbes | [core] Move returncode handling to OneMeasurement | Jul 15 2015 | |||
| 35720bb2aa51 | Sean Busbey | Merge pull request #308 from busbey/pr-183 | Jul 8 2015 | |||
| ee436f43dd14 | Sean Busbey | Merge pull request #348 from busbey/0.2.0-release-cleanup | Jul 8 2015 | |||
| 9f69c1cd9301 | Sean Busbey | [docs] update README for 0.2.0 release. | Jul 8 2015 | |||
| 5e384b4c4c99 | Sean Busbey | Merge pull request #338 from tlopatic/master | Jul 7 2015 | |||
| ba78526c7518 | Sean Busbey | Merge pull request #309 from busbey/pr-228 | Jul 6 2015 | |||
| 5df411f3da59 | Thomas Lopatic | Execute correct number of operations, even if not a multiple of thread count. | Jul 3 2015 | |||
| 7195b6c95a1a | Connor McCoy | Merge pull request #324 from tlopatic/master | Jul 1 2015 | |||
| 70479849ec4f | Thomas Lopatic | More reasonable write overload handling. | Jul 1 2015 | |||
| e80ffcf2bb66 | Sean Busbey | Merge pull request #329 from busbey/issue-315 | Jun 30 2015 | |||
| b770679fe19b | Sean Busbey | [scripts] clean up runtime classpath. | Jun 30 2015 | |||
| 458e6268c74e | Sean Busbey | Merge pull request #331 from busbey/issue-294 | Jun 29 2015 | |||
| 77541a9e2808 | Sean Busbey | [packaging] remove CHANGELOG | Jun 28 2015 | |||
| 9a8e37a40016 | Thomas Lopatic | Use -1 as error result. | Jun 26 2015 | |||
| e45ebecdf80c | Connor McCoy | Merge pull request #325 from cmccoy/hbase-readme | Jun 25 2015 | |||
| a6e1c636ea69 | Connor McCoy | [hbase] README updates | Jun 25 2015 | |||
| ecadf1f078aa | Sean Busbey | Merge pull request #323 from bigbes/master | Jun 25 2015 | |||
| 13e4086131ce | Thomas Lopatic | Better error messages. | Jun 25 2015 | |||
| dadbf6c5944a | Thomas Lopatic | Added missing annotation. | Jun 25 2015 | |||
| 9a774cc91742 | Thomas Lopatic | Document correct default timeout. | Jun 25 2015 | |||
| 35df165ce907 | Thomas Lopatic | Add support for Aerospike. | Jun 25 2015 |