flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From esam...@apache.org
Subject svn commit: r1225942 - in /incubator/flume/branches/flume-728: bin/flume-env.sh.template conf/log4j.properties contrib/flogger/Makefile contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp flume-ng-core/src/main/avro/flume.avdl
Date Fri, 30 Dec 2011 21:55:53 GMT
Author: esammer
Date: Fri Dec 30 21:55:52 2011
New Revision: 1225942

URL: http://svn.apache.org/viewvc?rev=1225942&view=rev
Log:
FLUME-915: Incorrect license information in various files

Modified:
    incubator/flume/branches/flume-728/bin/flume-env.sh.template
    incubator/flume/branches/flume-728/conf/log4j.properties
    incubator/flume/branches/flume-728/contrib/flogger/Makefile
    incubator/flume/branches/flume-728/contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp
    incubator/flume/branches/flume-728/flume-ng-core/src/main/avro/flume.avdl

Modified: incubator/flume/branches/flume-728/bin/flume-env.sh.template
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/bin/flume-env.sh.template?rev=1225942&r1=1225941&r2=1225942&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/bin/flume-env.sh.template (original)
+++ incubator/flume/branches/flume-728/bin/flume-env.sh.template Fri Dec 30 21:55:52 2011
@@ -1,18 +1,19 @@
-# Licensed to Cloudera, Inc. under one
+# 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.  Cloudera, Inc. licenses this file
+# 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
+#  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.
+# 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.
 
 # If this file is named bin/flume-env.sh, it sourced during execution
 # of the flume script and the flume-daemon.sh script.

Modified: incubator/flume/branches/flume-728/conf/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/conf/log4j.properties?rev=1225942&r1=1225941&r2=1225942&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/conf/log4j.properties (original)
+++ incubator/flume/branches/flume-728/conf/log4j.properties Fri Dec 30 21:55:52 2011
@@ -1,20 +1,21 @@
 # Define some default values that can be overridden by system properties
 
-# Licensed to Cloudera, Inc. under one
+# 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.  Cloudera, Inc. licenses this file
+# 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
+#  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.
+# 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.
 
 flume.root.logger=DEBUG,console
 flume.log.dir=.

Modified: incubator/flume/branches/flume-728/contrib/flogger/Makefile
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/contrib/flogger/Makefile?rev=1225942&r1=1225941&r2=1225942&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/contrib/flogger/Makefile (original)
+++ incubator/flume/branches/flume-728/contrib/flogger/Makefile Fri Dec 30 21:55:52 2011
@@ -1,20 +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
 #
- # Licensed to Cloudera, Inc. under one
- # or more contributor license agreements.  See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership.  Cloudera, Inc. 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.
+#  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.
 
 CC = g++
 SRCS = src/cpp/ThriftThinFlumeRPC.cpp

Modified: incubator/flume/branches/flume-728/contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp?rev=1225942&r1=1225941&r2=1225942&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp (original)
+++ incubator/flume/branches/flume-728/contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp Fri
Dec 30 21:55:52 2011
@@ -1,19 +1,20 @@
 /**
- * Licensed to Cloudera, Inc. under one
+ * 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.  Cloudera, Inc. licenses this file
+ * 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
+ * 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.
+ * 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.
  */
 
 #define  HOST_ARG "-h"

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/avro/flume.avdl
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/avro/flume.avdl?rev=1225942&r1=1225941&r2=1225942&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/avro/flume.avdl (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/avro/flume.avdl Fri Dec 30 21:55:52
2011
@@ -1,21 +1,22 @@
 /**
- * Licensed to Cloudera, Inc. under one
+ * 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.  Cloudera, Inc. licenses this file
+ * 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
+ * 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.
+ * 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.
  */
- 
+
 @namespace("org.apache.flume.source.avro")
 
 protocol AvroSourceProtocol {
@@ -33,4 +34,4 @@ protocol AvroSourceProtocol {
 
   Status appendBatch( array<AvroFlumeEvent> events );
 
-}
\ No newline at end of file
+}



Mime
View raw message