You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by hu...@apache.org on 2019/03/14 09:41:56 UTC
[hawq] branch huor_orc updated (98d53d5 -> 7936ceb)
This is an automated email from the ASF dual-hosted git repository.
huor pushed a change to branch huor_orc
in repository https://gitbox.apache.org/repos/asf/hawq.git.
discard 98d53d5 Fix travis failure due to missing apache license information
new 7936ceb HAWQ-1679. Fix travis failure due to missing apache license information
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (98d53d5)
\
N -- N -- N refs/heads/huor_orc (7936ceb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[hawq] 01/01: HAWQ-1679. Fix travis failure due to missing apache
license information
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
huor pushed a commit to branch huor_orc
in repository https://gitbox.apache.org/repos/asf/hawq.git
commit 7936ceb6c56a5ede922606994eaa720471c71fc7
Author: Ruilong Huo <hu...@163.com>
AuthorDate: Thu Mar 14 17:37:02 2019 +0800
HAWQ-1679. Fix travis failure due to missing apache license information
---
contrib/orc/cwrapper/Makefile | 20 +++++++++++++++++++-
contrib/orc/cwrapper/format/Makefile | 20 +++++++++++++++++++-
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/contrib/orc/cwrapper/Makefile b/contrib/orc/cwrapper/Makefile
index d731af8..f8b3c53 100644
--- a/contrib/orc/cwrapper/Makefile
+++ b/contrib/orc/cwrapper/Makefile
@@ -1,7 +1,25 @@
+# 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.
+#
+
cwrapper.o: cwrapper.cpp cwrapper.h
$(MAKE) -C format liborc_format.so
g++ --shared -o cwrapper.o cwrapper.cpp -Lformat -lorc_format
clean distclean:
$(MAKE) -C format $@ || true;
- rm -f ./cwrapper.o
\ No newline at end of file
+ rm -f ./cwrapper.o
diff --git a/contrib/orc/cwrapper/format/Makefile b/contrib/orc/cwrapper/format/Makefile
index cc896f8..d5a4cbe 100644
--- a/contrib/orc/cwrapper/format/Makefile
+++ b/contrib/orc/cwrapper/format/Makefile
@@ -1,6 +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.
+#
+
All: orc_format.so
liborc_format.so: orc_format.cpp
g++ --shared -o liborc_format.so orc_format.cpp
clean:
- rm -f ./liborc_format.so
\ No newline at end of file
+ rm -f ./liborc_format.so