fix merge

apache · Oct 27, 2016 · 96ce6a5 · 96ce6a5
1 parent a4081d4
commit 96ce6a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R
@@ -1384,6 +1384,8 @@ setGeneric("spark.randomForest",
 #' @export
 setGeneric("spark.survreg", function(data, formula) { standardGeneric("spark.survreg") })
 
+#' @rdname spark.lda
+#' @export
 setGeneric("spark.posterior", function(object, newData) { standardGeneric("spark.posterior") })
 
 #' @rdname spark.lda

diff --git a/R/pkg/R/mllib.R b/R/pkg/R/mllib.R
@@ -127,7 +127,7 @@ setClass("RandomForestClassificationModel", representation(jobj = "jobj"))
 #' @seealso \link{spark.als}, \link{spark.gaussianMixture}, \link{spark.isoreg}, \link{spark.kmeans},
 #' @seealso \link{spark.lda}, \link{spark.logit}, \link{spark.mlp}, \link{spark.naiveBayes},
 #' @seealso \link{spark.randomForest}, \link{spark.survreg},
-\#' @seealso \link{read.ml}
+#' @seealso \link{read.ml}
 NULL
 
 #' Makes predictions from a MLlib model