You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/10/26 12:30:11 UTC

svn commit: r1189116 - in /tomcat/trunk: .gitignore test/webapp-3.0/welcome-files/sub/.gitignore

Author: kkolinko
Date: Wed Oct 26 10:30:11 2011
New Revision: 1189116

URL: http://svn.apache.org/viewvc?rev=1189116&view=rev
Log:
Followup to r1188930
Add license header to .gitignore
Added svn:eol-style=native

Modified:
    tomcat/trunk/.gitignore   (contents, props changed)
    tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore   (contents, props changed)

Modified: tomcat/trunk/.gitignore
URL: http://svn.apache.org/viewvc/tomcat/trunk/.gitignore?rev=1189116&r1=1189115&r2=1189116&view=diff
==============================================================================
--- tomcat/trunk/.gitignore (original)
+++ tomcat/trunk/.gitignore Wed Oct 26 10:30:11 2011
@@ -1,3 +1,19 @@
+# -----------------------------------------------------------------------------
+# 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.
+# -----------------------------------------------------------------------------
 target
 output
 build.properties

Propchange: tomcat/trunk/.gitignore
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore?rev=1189116&r1=1189115&r2=1189116&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore (original)
+++ tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore Wed Oct 26 10:30:11 2011
@@ -1,4 +1,24 @@
-# Ignore everything in this directory
-*
-# Except this file
+# -----------------------------------------------------------------------------
+# 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.
+# -----------------------------------------------------------------------------
+# Git ignores empty directories and the unit tests require this directory to
+# be present for the welcome file tests to pass. The presence of this file
+# doesn't break the unit tests.
+#
+# Ignore everything in this directory
+*
+# Except this file
 !.gitignore
\ No newline at end of file

Propchange: tomcat/trunk/test/webapp-3.0/welcome-files/sub/.gitignore
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org