diff options
author | Patrick Wendell <pwendell@gmail.com> | 2013-09-07 21:16:01 -0700 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2013-09-07 21:16:01 -0700 |
commit | a8e376ec0f59212e076a11a072434913dd26c6e2 (patch) | |
tree | 913de246c7f3213bd40836de51d51bdea912280a | |
parent | cfde85e395727a62f971a8c02c978dc9cd16a339 (diff) | |
parent | 6d2198643ccb3f3c1a7a3cf07b5b96a98ae7bb1c (diff) | |
download | spark-a8e376ec0f59212e076a11a072434913dd26c6e2.tar.gz spark-a8e376ec0f59212e076a11a072434913dd26c6e2.tar.bz2 spark-a8e376ec0f59212e076a11a072434913dd26c6e2.zip |
Merge pull request #904 from pwendell/master
Adding Apache license to two files
-rw-r--r-- | ec2/deploy.generic/root/spark-ec2/ec2-variables.sh | 17 | ||||
-rw-r--r-- | project/project/SparkPluginBuild.scala | 19 |
2 files changed, 35 insertions, 1 deletions
diff --git a/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh b/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh index 675429c57e..42e8faa26e 100644 --- a/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh +++ b/ec2/deploy.generic/root/spark-ec2/ec2-variables.sh @@ -1,5 +1,22 @@ #!/usr/bin/env bash +# +# 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. +# + # These variables are automatically filled in by the spark-ec2 script. export MASTERS="{{master_list}}" export SLAVES="{{slave_list}}" diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala index 999611982a..6a66bd1d06 100644 --- a/project/project/SparkPluginBuild.scala +++ b/project/project/SparkPluginBuild.scala @@ -1,7 +1,24 @@ +/* + * 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 sbt._ object SparkPluginDef extends Build { lazy val root = Project("plugins", file(".")) dependsOn(junitXmlListener) /* This is not published in a Maven repository, so we get it from GitHub directly */ lazy val junitXmlListener = uri("git://github.com/ijuma/junit_xml_listener.git#fe434773255b451a38e8d889536ebc260f4225ce") -}
\ No newline at end of file +} |