From 8d9201268b9e528be891d494a6a48521ca528115 Mon Sep 17 00:00:00 2001
From: Hossein <hossein@databricks.com>
Date: Thu, 30 Jul 2015 15:04:19 -0700
Subject: [PATCH] Added merge as an alias for join

---
 R/pkg/NAMESPACE     | 1 +
 R/pkg/R/DataFrame.R | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/R/pkg/NAMESPACE b/R/pkg/NAMESPACE
index d5eb1d21de9ef..9476467f9be7c 100644
--- a/R/pkg/NAMESPACE
+++ b/R/pkg/NAMESPACE
@@ -44,6 +44,7 @@ exportMethods("arrange",
               "isLocal",
               "join",
               "limit",
+              "merge",
               "orderBy",
               "mutate",
               "names",
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index 149dd7ae5df46..39e0cb5fa8b0c 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -1205,6 +1205,15 @@ setMethod("join",
             dataFrame(sdf)
           })
 
+#' rdname merge
+#' aliases join
+setMethod("merge",
+          signature(x = "DataFrame", y = "DataFrame"),
+          function(x, y, joinExpr = NULL, joinType = NULL) {
+            join(x, y, joinExpr, joinType)
+          })
+
+
 #' UnionAll
 #'
 #' Return a new DataFrame containing the union of rows in this DataFrame