Merge branch 'master' of

ssh://github.com/mallocator/Elasticsearch-HBase-River.git Conflicts: src/main/java/org/elasticsearch/river/hbase/HBaseCallbackLogger.java src/main/java/org/elasticsearch/river/hbase/HBaseParser.java
mallocator · Apr 18, 2013 · 93acda3 · 93acda3
2 parents 1bca36c + f330b74
commit 93acda3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/org/elasticsearch/river/hbase/HBaseParser.java b/src/main/java/org/elasticsearch/river/hbase/HBaseParser.java
@@ -278,4 +278,4 @@ protected long setMinTimestamp(final Scanner scanner) {
 		this.logger.debug("Found latest timestamp in ElasticSearch to be not present (-> 0)");
 		return 0L;
 	}
-}
+}