Merge remote-tracking branch 'upstream/master'
Conflicts: pom.xml
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- CHANGELOG 3 additions, 0 deletionsCHANGELOG
- bin/ycsb 2 additions, 1 deletionbin/ycsb
- core/src/main/java/com/yahoo/ycsb/DBWrapper.java 3 additions, 0 deletionscore/src/main/java/com/yahoo/ycsb/DBWrapper.java
- dynamodb/README 5 additions, 2 deletionsdynamodb/README
- dynamodb/conf/dynamodb.properties 1 addition, 1 deletiondynamodb/conf/dynamodb.properties
- dynamodb/src/main/java/com/yahoo/ycsb/db/DynamoDBClient.java 3 additions, 3 deletionsdynamodb/src/main/java/com/yahoo/ycsb/db/DynamoDBClient.java
- elasticsearch/README.md 65 additions, 0 deletionselasticsearch/README.md
- elasticsearch/pom.xml 71 additions, 0 deletionselasticsearch/pom.xml
- elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticSearchClient.java 266 additions, 0 deletions.../src/main/java/com/yahoo/ycsb/db/ElasticSearchClient.java
- elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticSearchClientTest.java 137 additions, 0 deletions.../test/java/com/yahoo/ycsb/db/ElasticSearchClientTest.java
- hbase/src/main/java/com/yahoo/ycsb/db/HBaseClient.java 7 additions, 0 deletionshbase/src/main/java/com/yahoo/ycsb/db/HBaseClient.java
- jdbc/src/main/conf/db.properties 1 addition, 0 deletionsjdbc/src/main/conf/db.properties
- jdbc/src/main/java/com/yahoo/ycsb/db/JdbcDBClient.java 22 additions, 3 deletionsjdbc/src/main/java/com/yahoo/ycsb/db/JdbcDBClient.java
- jdbc/src/main/java/com/yahoo/ycsb/db/JdbcDBClientConstants.java 7 additions, 1 deletion...rc/main/java/com/yahoo/ycsb/db/JdbcDBClientConstants.java
- mongodb/README.md 2 additions, 0 deletionsmongodb/README.md
- mongodb/src/main/java/com/yahoo/ycsb/db/MongoDbClient.java 170 additions, 114 deletionsmongodb/src/main/java/com/yahoo/ycsb/db/MongoDbClient.java
- pom.xml 4 additions, 3 deletionspom.xml
Loading
Please register or sign in to comment