Merge remote-tracking branch 'upstream/master'
Conflicts: bin/ycsb geode/src/main/java/com/yahoo/ycsb/db/GeodeClient.java pom.xml
No related branches found
No related tags found
Showing
- .editorconfig 14 additions, 0 deletions.editorconfig
- .gitignore 11 additions, 1 deletion.gitignore
- .travis.yml 20 additions, 0 deletions.travis.yml
- BUILD 0 additions, 31 deletionsBUILD
- NOTICE.txt 4 additions, 0 deletionsNOTICE.txt
- README.md 7 additions, 4 deletionsREADME.md
- accumulo/README.md 83 additions, 0 deletionsaccumulo/README.md
- accumulo/pom.xml 39 additions, 23 deletionsaccumulo/pom.xml
- accumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java 0 additions, 453 deletionsaccumulo/src/main/java/com/yahoo/ycsb/db/AccumuloClient.java
- accumulo/src/main/java/com/yahoo/ycsb/db/ZKProducerConsumer.java 0 additions, 140 deletions...o/src/main/java/com/yahoo/ycsb/db/ZKProducerConsumer.java
- accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java 348 additions, 0 deletions.../main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java
- accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/package-info.java 22 additions, 0 deletions...rc/main/java/com/yahoo/ycsb/db/accumulo/package-info.java
- accumulo/src/test/java/com/yahoo/ycsb/db/accumulo/AccumuloTest.java 209 additions, 0 deletions...rc/test/java/com/yahoo/ycsb/db/accumulo/AccumuloTest.java
- accumulo/src/test/resources/log4j.properties 29 additions, 0 deletionsaccumulo/src/test/resources/log4j.properties
- aerospike/pom.xml 2 additions, 2 deletionsaerospike/pom.xml
- aerospike/src/main/java/com/yahoo/ycsb/db/AerospikeClient.java 31 additions, 64 deletions...pike/src/main/java/com/yahoo/ycsb/db/AerospikeClient.java
- aerospike/src/main/java/com/yahoo/ycsb/db/package-info.java 21 additions, 0 deletionsaerospike/src/main/java/com/yahoo/ycsb/db/package-info.java
- bin/ycsb 51 additions, 17 deletionsbin/ycsb
- binding-parent/datastore-specific-descriptor/pom.xml 1 addition, 1 deletionbinding-parent/datastore-specific-descriptor/pom.xml
- binding-parent/pom.xml 15 additions, 2 deletionsbinding-parent/pom.xml
Loading
Please register or sign in to comment