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 C110018FE2 for ; Wed, 16 Dec 2015 08:58:00 +0000 (UTC) Received: (qmail 56916 invoked by uid 500); 16 Dec 2015 08:58:00 -0000 Delivered-To: apmail-spark-commits-archive@spark.apache.org Received: (qmail 56883 invoked by uid 500); 16 Dec 2015 08:58:00 -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 56872 invoked by uid 99); 16 Dec 2015 08:58:00 -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; Wed, 16 Dec 2015 08:58:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 95885DFD5B; Wed, 16 Dec 2015 08:58:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rxin@apache.org To: commits@spark.apache.org Date: Wed, 16 Dec 2015 08:58:00 -0000 Message-Id: <5e86172ca6384d4da8696c88c9719095@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] spark git commit: Revert "[HOTFIX] Compile error from commit 31b3910" Repository: spark Updated Branches: refs/heads/master 554d840a9 -> 1a3d0cd9f Revert "[HOTFIX] Compile error from commit 31b3910" This reverts commit 840bd2e008da5b22bfa73c587ea2c57666fffc60. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/18ea11c3 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/18ea11c3 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/18ea11c3 Branch: refs/heads/master Commit: 18ea11c3a84e5eafd81fa0fe7c09224e79c4e93f Parents: 554d840 Author: Reynold Xin Authored: Wed Dec 16 00:57:07 2015 -0800 Committer: Reynold Xin Committed: Wed Dec 16 00:57:07 2015 -0800 ---------------------------------------------------------------------- sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/18ea11c3/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala index 33b03be..b69d441 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala @@ -234,7 +234,7 @@ class DataFrame private[sql]( // For Data that has more than "_numRows" records if (hasMoreData) { val rowsString = if (_numRows == 1) "row" else "rows" - sb.append(s"only showing top ${_numRows} $rowsString\n") + sb.append(s"only showing top $_numRows $rowsString\n") } sb.toString() --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org