Repository: spark
Updated Branches:
  refs/heads/branch-1.3 317694ccf -> bb1661872


[SPARK-6074] [sql] Package pyspark sql bindings.

This is needed for the SQL bindings to work on Yarn.

Author: Marcelo Vanzin <[email protected]>

Closes #4822 from vanzin/SPARK-6074 and squashes the following commits:

fb52001 [Marcelo Vanzin] [SPARK-6074] [sql] Package pyspark sql bindings.

(cherry picked from commit fd8d283eeb98e310b1e85ef8c3a8af9e547ab5e0)
Signed-off-by: Sean Owen <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bb166187
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bb166187
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bb166187

Branch: refs/heads/branch-1.3
Commit: bb1661872c0c6ee51acd5919e44826ed28e6beb4
Parents: 317694c
Author: Marcelo Vanzin <[email protected]>
Authored: Sun Mar 1 11:05:10 2015 +0000
Committer: Sean Owen <[email protected]>
Committed: Sun Mar 1 11:05:20 2015 +0000

----------------------------------------------------------------------
 sql/core/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/bb166187/sql/core/pom.xml
----------------------------------------------------------------------
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 381571c..314548e 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -109,5 +109,13 @@
   <build>
     
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
     
<testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
+    <resources>
+      <resource>
+        <directory>../../python</directory>
+        <includes>
+          <include>pyspark/sql/*.py</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to