HAWQ-1799. fix merge issue

DISCLAIMER

@@ -1,5 +1,5 @@
 Apache HAWQ is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
+Foundation (ASF), sponsored by the Apache PMC.
 
 Incubation is required of all newly accepted projects until a further
 review indicates that the infrastructure, communications, and decision

LICENSE

@@ -202,9 +202,9 @@
 
 =======================================================================
 
-Apache HAWQ (incubating) Subcomponents:
+Apache HAWQ Subcomponents:
 
-  The Apache HAWQ (incubating) project contains subcomponents with
+  The Apache HAWQ project contains subcomponents with
   separate copyright notices and license terms. Your use of the source
   code for these subcomponents is subject to the terms and conditions
   of the following licenses.

NOTICE

@@ -1,4 +1,4 @@
-Apache HAWQ (incubating) 
+Apache HAWQ
 Copyright 2017 The Apache Software Foundation.
 
 This product includes software developed at

README.md

@@ -1,20 +1,20 @@
-![HAWQ](http://hawq.incubator.apache.org/images/logo-hawq.png)
+![HAWQ](http://hawq.apache.org/images/logo-hawq.png)
 
 ---
 
 |CI Process|Status|
 |---|---|
-|Travis CI Build|[![https://travis-ci.org/apache/incubator-hawq.svg?branch=master](https://travis-ci.org/apache/incubator-hawq.png?branch=master)](https://travis-ci.org/apache/incubator-hawq?branch=master)|
+|Travis CI Build|[![https://travis-ci.org/apache/hawq.svg?branch=master](https://travis-ci.org/apache/hawq.png?branch=master)](https://travis-ci.org/apache/hawq?branch=master)|
 |Apache Release Audit Tool ([RAT](https://creadur.apache.org/rat/))|[![Rat Status](https://builds.apache.org/buildStatus/icon?job=HAWQ-rat)](https://builds.apache.org/view/HAWQ/job/HAWQ-rat/)|
-|Coverity Static Analysis   |[![Coverity Scan Build](https://scan.coverity.com/projects/apache-incubator-hawq/badge.svg)](https://scan.coverity.com/projects/apache-incubator-hawq)|
+|Coverity Static Analysis   |[![Coverity Scan Build](https://scan.coverity.com/projects/apache-hawq/badge.svg)](https://scan.coverity.com/projects/apache-hawq)|
 
 ---
 
-[Website](http://hawq.incubator.apache.org/) |
+[Website](http://hawq.apache.org/) |
 [Wiki](https://cwiki.apache.org/confluence/display/HAWQ) |
-[Documentation](http://hawq.incubator.apache.org/docs/userguide/2.2.0.0-incubating/overview/HAWQOverview.html) |
-[Developer Mailing List](mailto:dev@hawq.incubator.apache.org) |
-[User Mailing List](mailto:user@hawq.incubator.apache.org) |
+[Documentation](http://hawq.apache.org/docs/userguide/latest/) |
+[Developer Mailing List](mailto:[email protected]) |
+[User Mailing List](mailto:[email protected]) |
 [Q&A Collections](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65144284) |
 [Open Defect](https://issues.apache.org/jira/browse/HAWQ)
 
@@ -43,7 +43,7 @@ Apache HAWQ is a Hadoop native SQL query engine that combines the key technologi
  - Support most third party tools: Tableau, SAS et al.
  - Standard connectivity: JDBC/ODBC
 
-# Build & Setup HAWQ++ on Mac
+# Build & Setup HAWQ on Mac
 
 ## Step 1 Setup HDFS
 
@@ -148,7 +148,7 @@ hadoop fs -ls /
 
 **When things go wrong, check the log and view the FAQ in wiki first.**
 
-## Step 2 Setup hawq++
+## Step 2 Setup hawq
 
 ### Step 2.1 System configuration
 
@@ -194,7 +194,7 @@ sudo install -o $USER -d /usr/local/hawq
 1. Setup toolchain and thirdparty dependency referring to [here](https://github.com/oushu-io/hornet/tree/master/thirdparty).
 2. Build hornet referring to [here](https://github.com/oushu-io/hornet#hornet).
 
-### Step 2.4 Build HAWQ++
+### Step 2.4 Build HAWQ
 
 - 2.4.1 Add hawq environment information to `~/.bashrc`, and **`source ~/.bashrc`** to make it effect.
 
@@ -205,7 +205,7 @@ sudo install -o $USER -d /usr/local/hawq
   export DEPENDENCY_PATH=/opt/dependency/package
   source /opt/dependency-Darwin/package/env.sh
   ```
-- 2.4.2 Build HAWQ++
+- 2.4.2 Build HAWQ
 
   ```bash
   cd ~/dev/hawq
@@ -218,7 +218,7 @@ sudo install -o $USER -d /usr/local/hawq
   ```
 
 
-### Step 2.5 Configure HAWQ++
+### Step 2.5 Configure HAWQ
 
 ```shell
 mkdir /tmp/magma_master
@@ -227,7 +227,7 @@ mkdir /tmp/magma_segment
 
 Feel free to use the default `/usr/local/hawq/etc/hawq-site.xml`. Pay attention to mapping `hawq_dfs_url` to `fs.defaultFS` in `${HADOOP_HOME}/etc/hadoop/core-site.xml`.
 
-### Step 2.6 Init/Start/Stop HAWQ++
+### Step 2.6 Init/Start/Stop HAWQ
 
 ```bash
 # Before initializing HAWQ, you need to install HDFS and make sure it works.
@@ -278,11 +278,11 @@ hawq stop/restart/start cluster
 > ps -ef | grep magma | grep -v grep | awk '{print $2}'| xargs kill -9
 > ```
 
-# Build HAWQ++ on Centos 7
+# Build HAWQ on Centos 7
 
 Almost the same as that on macOS, feel free to have a try, referring to [here](https://github.com/oushu-io/knowledgebase/wiki/Build-HAWQ-on-Linux-macOS#build-hawq-on-linuxmacos).
 
-# Build HAWQ++ on Centos 7(6.X) using docker
+# Build HAWQ on Centos 7(6.X) using docker
 
 Almost the same as that on macOS, feel free to have a try, referring to [here](https://github.com/oushu-io/knowledgebase/wiki/Build-HAWQ-in-Docker-Container#build-hawq-in-docker-container).
 

contrib/hawq-ambari-plugin/README.md

@@ -57,7 +57,7 @@ Properties specified in the [build.properties](build.properties) file:
 To build the rpm for hawq-ambari-plugin, change the [build.properties](build.properties) file with the required parameters and run ```mvn install``` command under hawq-ambari-plugin directory:
 ```
 $ pwd
-incubator-hawq/contrib/hawq-ambari-plugin
+hawq/contrib/hawq-ambari-plugin
 $ mvn clean resources:copy-resources rpm:rpm -Dbuild_number=1
 ```
 
@@ -95,4 +95,4 @@ $ ./add-hawq.py --user <ambari-username> --password <ambari-password> --stack HD
 **Please restart ambari-server after running the script so that the changes take effect:**
 ```
 $ ambari-server restart
-```
+```

contrib/hawq-docker/README.md

@@ -1,6 +1,6 @@
 # hawq-docker
 
-hawq-docker is based on *wangzw's* repo *hawq-devel-env*. It is the docker images and scripts to help developers of Apache HAWQ to setup building and testing environment with docker.
+hawq-docker is based on repo *hawq-devel-env*. It is the docker images and scripts to help developers of Apache HAWQ to setup building and testing environment with docker.
 
 Both CentOS 7 and CentOS 6 are supported.
 Change variable **OS_VERSION** (:= centos7 OR centos6) in Makefile to switch between CentOS 7 and CentOS 6.
@@ -14,8 +14,8 @@ https://docs.docker.com/
 # Setup build and test environment
 * clone hawq repository
 ```
-git clone https://github.com/apache/incubator-hawq.git .
-cd incubator-hawq/contrib/hawq-docker
+git clone https://github.com/apache/hawq.git .
+cd hawq/contrib/hawq-docker
 ```
 * Get the docker images
 ```
@@ -51,7 +51,7 @@ sudo -u hdfs hdfs dfsadmin -report
 ```
 * clone Apache HAWQ code to /data direcotry
 ```
-git clone https://github.com/apache/incubator-hawq.git /data/hawq
+git clone https://github.com/apache/hawq.git /data/hawq
 ```
 * build Apache HAWQ
 ```

contrib/hawq-package/hawq.spec

@@ -30,7 +30,7 @@ Version:    %{hawq_version}
 Release:    %{rpm_os_version}
 License:    ASL 2.0
 Group:      Applications/Databases
-URL:        http://hawq.incubator.apache.org
+URL:        http://hawq.apache.org
 Prefix:     /usr/local
 BuildArch:  %{arch}
 SOURCE0 :   apache-hawq-src-%{hawq_version}-incubating.tar.gz

depends/libhdfs3/debian/changelog.in

@@ -1,5 +1,3 @@
 libhdfs3 (@libhdfs3_VERSION_STRING@-1) unstable; urgency=low
 
   * Initial release
-
- -- Zhanwei Wang <[email protected]>  Fri, 06 Feb 2015 11:58:35 +0100

depends/libhdfs3/debian/control

@@ -1,6 +1,5 @@
 Source: libhdfs3
 Priority: optional
-Maintainer: Zhanwei Wang <[email protected]>
 Build-Depends: debhelper (>= 9), cmake, libprotobuf-dev, protobuf-compiler, libxml2-dev, libkrb5-dev, uuid-dev, libgsasl7-dev
 Standards-Version: 3.9.5
 Section: libs

depends/libhdfs3/rpms/libhdfs3.spec

@@ -88,5 +88,4 @@ small memory footprint code base. In addition, it is easy to use and deploy.
 /sbin/ldconfig
 
 %changelog
-* Sun Oct 04 2015 Zhanwei Wang <[email protected]> - 2.2.30-1
 - Initial RPM release

dist/hawq/DISCLAIMER

@@ -1,5 +1,5 @@
 Apache HAWQ is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
+Foundation (ASF), sponsored by the Apache PMC.
 
 Incubation is required of all newly accepted projects until a further
 review indicates that the infrastructure, communications, and decision

pxf/resources/META-INF/DISCLAIMER

@@ -1,5 +1,5 @@
 Apache HAWQ is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
+Foundation (ASF), sponsored by the Apache PMC.
 
 Incubation is required of all newly accepted projects until a further
 review indicates that the infrastructure, communications, and decision

src/Makefile

@@ -111,7 +111,6 @@ clean: clear-cwrapper
 	$(MAKE) -C tutorial NO_PGXS=1 $@
 	$(MAKE) -C test/thread $@
 	$(MAKE) -C test/regress $@
-	$(MAKE) -C test/feature $@
 	$(MAKE) -C tools/fsync $@
 
 distclean maintainer-clean: clear-cwrapper
@@ -128,7 +127,6 @@ distclean maintainer-clean: clear-cwrapper
 	$(MAKE) -C tutorial NO_PGXS=1 $@
 	$(MAKE) -C test/thread $@
 	$(MAKE) -C test/regress $@
-	$(MAKE) -C test/feature clean
 	$(MAKE) -C tools/fsync $@
 	rm -f Makefile.port Makefile.global
 

src/include/catalog/calico.pl

@@ -191,7 +191,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

src/include/catalog/caqltrack.pl

@@ -146,7 +146,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

src/include/catalog/caqluniqdef.pl

@@ -95,7 +95,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

src/include/catalog/catullus.pl

@@ -115,7 +115,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

src/include/catalog/pablopcatso.pl

@@ -135,7 +135,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

src/include/catalog/sleazy.pl

@@ -277,7 +277,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

src/include/catalog/tidycat.pl

@@ -327,7 +327,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

src/test/Makefile

@@ -11,15 +11,11 @@
 #
 #-------------------------------------------------------------------------
 
-.PHONY: feature_test clean distclean
+.PHONY: clean distclean
 
 .DEFAULT:
 	$(MAKE) -C regress $@
 
-feature-test:
-	$(MAKE) -C feature all
-
 clean:
-	$(MAKE) -C feature clean
 
 distclean: clean

src/test/regress/atmsort.pl

@@ -376,7 +376,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

src/test/regress/dld.pl

@@ -87,7 +87,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

src/test/regress/explain.pl

@@ -268,7 +268,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

src/test/regress/get_ereport.pl

@@ -106,7 +106,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

src/test/regress/gpdiff.pl

@@ -139,7 +139,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

src/test/regress/gpexclude.pl

@@ -158,7 +158,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

src/test/regress/gpsourcify.pl

@@ -107,7 +107,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

src/test/regress/gpstringsubs.pl

@@ -170,7 +170,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

src/test/regress/gptorment.pl

@@ -166,7 +166,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

src/test/regress/upg2_wizard.pl

@@ -121,7 +121,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut