Updated YCSB dependency and added my developer details to root pom
diff --git a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
index f9c4ab9..8000306 100644
--- a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
+++ b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestBase.java
@@ -221,8 +221,8 @@
}
@Test
- public void testBenchamarkExists() throws Exception {
- log.info("test method: testBenchamarkExists");
+ public void testBenchmarkExists() throws Exception {
+ log.info("test method: testBenchmarkExists");
DataStoreTestUtil.testBenchmarkGetExists(employeeStore);
}
diff --git a/pom.xml b/pom.xml
index 92fec42..5cdc319 100644
--- a/pom.xml
+++ b/pom.xml
@@ -288,10 +288,17 @@
<role>PMC Member</role>
</roles>
</developer>
+<<<<<<< HEAD
<developer>
<id>sheriffo</id>
<name>Sheriffo Ceesay</name>
<email>sheriffo [at] apache [dot] org</email>
+=======
+ <developer>
+ <id>chanakadkb</id>
+ <name>Chanaka Balasooriya</name>
+ <email>chanakadkb [at] apache [dot] org</email>
+>>>>>>> upstream/master
<roles>
<role>Committer</role>
<role>PMC Member</role>
