Return-Path: X-Original-To: apmail-spark-commits-archive@minotaur.apache.org Delivered-To: apmail-spark-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B209D173B1 for ; Fri, 4 Sep 2015 18:24:51 +0000 (UTC) Received: (qmail 6969 invoked by uid 500); 4 Sep 2015 18:24:51 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 6937 invoked by uid 500); 4 Sep 2015 18:24:51 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 6928 invoked by uid 99); 4 Sep 2015 18:24:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2015 18:24:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 773BCDFE20; Fri, 4 Sep 2015 18:24:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shivaram@apache.org To: commits@spark.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [MINOR] Minor style fix in SparkR Date: Fri, 4 Sep 2015 18:24:51 +0000 (UTC) Repository: spark Updated Branches: refs/heads/master cf4213864 -> 143e521d1 [MINOR] Minor style fix in SparkR `dev/lintr-r` passes on my machine now Author: Shivaram Venkataraman Closes #8601 from shivaram/sparkr-style-fix. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/143e521d Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/143e521d Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/143e521d Branch: refs/heads/master Commit: 143e521d1a0e16af18083524ceb4399cbe6372bc Parents: cf42138 Author: Shivaram Venkataraman Authored: Fri Sep 4 11:24:47 2015 -0700 Committer: Shivaram Venkataraman Committed: Fri Sep 4 11:24:47 2015 -0700 ---------------------------------------------------------------------- R/pkg/R/deserialize.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/143e521d/R/pkg/R/deserialize.R ---------------------------------------------------------------------- diff --git a/R/pkg/R/deserialize.R b/R/pkg/R/deserialize.R index 88f1861..d1858ec 100644 --- a/R/pkg/R/deserialize.R +++ b/R/pkg/R/deserialize.R @@ -60,7 +60,7 @@ readString <- function(con) { raw <- readBin(con, raw(), stringLen, endian = "big") string <- rawToChar(raw) Encoding(string) <- "UTF-8" - string + string } readInt <- function(con) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org