diff options
author | Andrew xia <junluan.xia@intel.com> | 2013-07-31 19:36:36 +0800 |
---|---|---|
committer | Andrew xia <junluan.xia@intel.com> | 2013-07-31 19:36:36 +0800 |
commit | 5670c96f29f9f5ea929f802b0f4e6460cd2c54af (patch) | |
tree | 27d75a3498d4bd5047f51b6ce5f42beac43cd0d8 /python/pyspark/java_gateway.py | |
parent | 5406013997d6b9e9e3f43c09cd3f53ec7b815efb (diff) | |
parent | e87de037d608231610352512b8f66d7232398374 (diff) | |
download | spark-5670c96f29f9f5ea929f802b0f4e6460cd2c54af.tar.gz spark-5670c96f29f9f5ea929f802b0f4e6460cd2c54af.tar.bz2 spark-5670c96f29f9f5ea929f802b0f4e6460cd2c54af.zip |
Merge branch 'master' into Pool_UI
Conflicts:
core/src/main/scala/spark/SparkContext.scala
core/src/main/scala/spark/scheduler/DAGScheduler.scala
core/src/main/scala/spark/scheduler/SparkListener.scala
core/src/main/scala/spark/scheduler/cluster/ClusterTaskSetManager.scala
core/src/main/scala/spark/scheduler/cluster/TaskSetManager.scala
core/src/main/scala/spark/scheduler/local/LocalTaskSetManager.scala
core/src/main/scala/spark/ui/jobs/IndexPage.scala
core/src/main/scala/spark/ui/jobs/JobProgressUI.scala
Diffstat (limited to 'python/pyspark/java_gateway.py')
-rw-r--r-- | python/pyspark/java_gateway.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/python/pyspark/java_gateway.py b/python/pyspark/java_gateway.py index 2329e536cc..e503fb7621 100644 --- a/python/pyspark/java_gateway.py +++ b/python/pyspark/java_gateway.py @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + import os import sys from subprocess import Popen, PIPE |