diff options
| author | Joseph E. Gonzalez <joseph.e.gonzalez@gmail.com> | 2013-09-17 17:34:24 -0700 |
|---|---|---|
| committer | Joseph E. Gonzalez <joseph.e.gonzalez@gmail.com> | 2013-09-17 17:34:24 -0700 |
| commit | a3fb29938cd61174785722054cc9331360ccccfe (patch) | |
| tree | 291f330beda2019db474f2a28fc81b2eb9ffcfb3 /project/build.properties | |
| parent | 205dba352f0905f77ce285aa1ad7e92f67681e4f (diff) | |
| parent | 5ccb60d467f58c104f37e05e99a50fdf06301e5e (diff) | |
| download | spark-a3fb29938cd61174785722054cc9331360ccccfe.tar.gz spark-a3fb29938cd61174785722054cc9331360ccccfe.tar.bz2 spark-a3fb29938cd61174785722054cc9331360ccccfe.zip | |
Merging changes between Reynold's branch and Joey's modifications.
Diffstat (limited to 'project/build.properties')
| -rw-r--r-- | project/build.properties | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/project/build.properties b/project/build.properties index 9b860e23c5..08e17131f6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1,18 @@ +# +# 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. +# + sbt.version=0.12.3 |