Merge branch 'master' of github.com:mallocator/Elasticsearch-Hadoop-R…

…iver Conflicts: .gitignore
mallocator · Mar 7, 2013 · 7e87841 · 7e87841
2 parents df2d307 + 20bc823
commit 7e87841
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+Elasticsearch-Hadoop-River
+==========================
+
+An import river similar to the elasticsearch mysql river