Merge pull request #1224 from busbey/pr-117-amend
[core] Handle merge conflicts for #117 and update it for newer bindings that reference field name prefix
No related branches found
No related tags found
Showing
- cloudspanner/src/main/java/com/yahoo/ycsb/db/cloudspanner/CloudSpannerClient.java 3 additions, 1 deletion...va/com/yahoo/ycsb/db/cloudspanner/CloudSpannerClient.java
- core/src/main/java/com/yahoo/ycsb/workloads/CoreWorkload.java 14 additions, 1 deletion.../src/main/java/com/yahoo/ycsb/workloads/CoreWorkload.java
- doc/coreproperties.html 2 additions, 1 deletiondoc/coreproperties.html
- elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java 5 additions, 3 deletions.../test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java
- elasticsearch5/src/test/java/com/yahoo/ycsb/db/elasticsearch5/ElasticsearchIntegTestBase.java 5 additions, 3 deletions...oo/ycsb/db/elasticsearch5/ElasticsearchIntegTestBase.java
- kudu/src/main/java/com/yahoo/ycsb/db/KuduYCSBClient.java 3 additions, 1 deletionkudu/src/main/java/com/yahoo/ycsb/db/KuduYCSBClient.java
- rocksdb/src/test/java/com/yahoo/ycsb/db/rocksdb/RocksDBClientTest.java 5 additions, 3 deletions...est/java/com/yahoo/ycsb/db/rocksdb/RocksDBClientTest.java
- solr/src/test/java/com/yahoo/ycsb/db/solr/SolrClientBaseTest.java 5 additions, 3 deletions.../test/java/com/yahoo/ycsb/db/solr/SolrClientBaseTest.java
- solr6/src/test/java/com/yahoo/ycsb/db/solr6/SolrClientBaseTest.java 5 additions, 3 deletions...test/java/com/yahoo/ycsb/db/solr6/SolrClientBaseTest.java
Loading
Please register or sign in to comment