Merge remote-tracking branch 'upstream/master'
67f5257a6204
Actions

Authored by Swapnil Bawaskar <sbawaska@vmware.com> on Mar 18 2014, 23:45.

Description

Merge remote-tracking branch 'upstream/master'

Conflicts:
pom.xml

Committed

Swapnil Bawaskar <sbawaska@vmware.com>

Mar 18 2014, 23:45

Pushed

iorgulescu

Oct 2 2018, 18:02

Parents

Branches

Unknown

Tags

Unknown

Swapnil Bawaskar <sbawaska@vmware.com> committed R7507:67f5257a6204: Merge remote-tracking branch 'upstream/master' (authored by Swapnil Bawaskar <sbawaska@vmware.com>).Mar 18 2014, 23:45

Commit	Author	Details	Committed
cc0505496526	Weston Platter	Merge pull request #137 from allanbank/mongodb-2.11.2	Mar 10 2014
03b4fe01b91f	Robert J. Moore	Update the MongoDB Java Driver version to 2.11.2.	Jul 27 2013
7b564cc3ffdb	Pierre Queinnec/Michi Mutsuzaki	gh-47 Fix an issue with JDBC scans	Dec 16 2012
89df1ac1e6ed	Elliott Clark/Michi Mutsuzaki	gh-100 Time clean up and count it for hbase as update.	Dec 16 2012
9b38c15d1b82	Carlos Tasada/Michi Mutsuzaki	gh-102 Minor fix so the classpath path separator is OS independent	Dec 16 2012
bbaaf80ee1a2	Robert J. Moore/Michi Mutsuzaki	gh-95 Update the MongoDB driver version to 2.9.0.	Dec 16 2012
92d86e74a8b3	Robert J. Moore/Michi Mutsuzaki	gh-95 Update the MongoDB driver to use a singleton Mongo instance for each test…	Dec 16 2012
0d2bf50e9e29	Michi Mutsuzaki	gh-97 Updated CHANGELOG	Oct 22 2012
9fef32a19fb7	Janani Narayanan/Michi Mutsuzaki	gh-97 Bug fixes in dynamodb plugin	Oct 22 2012
3827d9a303ac	saden1/Michi Mutsuzaki	gh-93 New ElasticSearch Database Implementation	Sep 11 2012

		Path
M		.gitignore
M		CHANGELOG
M		bin/ycsb
M		core/src/main/java/com/yahoo/ycsb/DBWrapper.java
M		dynamodb/README
M		dynamodb/conf/dynamodb.properties
M		dynamodb/src/main/java/com/yahoo/ycsb/db/DynamoDBClient.java
A	(dir)	elasticsearch/
A		elasticsearch/README.md
A		elasticsearch/pom.xml
A	(dir)	elasticsearch/src/
A	(dir)	elasticsearch/src/main/
A	(dir)	elasticsearch/src/main/java/
A	(dir)	elasticsearch/src/main/java/com/
A	(dir)	elasticsearch/src/main/java/com/yahoo/
A	(dir)	elasticsearch/src/main/java/com/yahoo/ycsb/
A	(dir)	elasticsearch/src/main/java/com/yahoo/ycsb/db/
A		elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticSearchClient.java
A	(dir)	elasticsearch/src/test/
A	(dir)	elasticsearch/src/test/java/
A	(dir)	elasticsearch/src/test/java/com/
A	(dir)	elasticsearch/src/test/java/com/yahoo/
A	(dir)	elasticsearch/src/test/java/com/yahoo/ycsb/
A	(dir)	elasticsearch/src/test/java/com/yahoo/ycsb/db/
A		elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticSearchClientTest.java
M		hbase/src/main/java/com/yahoo/ycsb/db/HBaseClient.java
M		jdbc/src/main/conf/db.properties
M		jdbc/src/main/java/com/yahoo/ycsb/db/JdbcDBClient.java
M		jdbc/src/main/java/com/yahoo/ycsb/db/JdbcDBClientConstants.java
M		mongodb/README.md
M		mongodb/src/main/java/com/yahoo/ycsb/db/MongoDbClient.java
M		pom.xml