diff --git a/.travis.yml b/.travis.yml index 978d6ad2b..f931ea39b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +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. + language: java sudo: required diff --git a/doc/development/development.howto.txt b/doc/development/development.howto.txt index 525ce2f76..f2648c47c 100644 --- a/doc/development/development.howto.txt +++ b/doc/development/development.howto.txt @@ -1,3 +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. + This document summarizes a discussion that took place on the "dev" ML: http://markmail.org/message/7lnus64entdwj4vo and http://markmail.org/message/3xjj2g74ga4iyijg @@ -21,4 +36,4 @@ The conclusions reported here are based on ideas presented in this blog post: After completion, and in the absence of technical objections, the feature branch is merged into the "master" branch, using the "--no-ff" git option. - That feature branch is then deleted. \ No newline at end of file + That feature branch is then deleted.