You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2018/01/03 22:04:17 UTC

[3/4] trafodion git commit: Adding repo and email address name changes.

Adding repo and email address name changes.


Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/b29118bb
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/b29118bb
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/b29118bb

Branch: refs/heads/master
Commit: b29118bb20a6f7eed38fa939f590f493c16b264b
Parents: 5dc33bf
Author: Steve Varnau <st...@esgyn.com>
Authored: Fri Dec 29 19:03:25 2017 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Fri Dec 29 19:03:25 2017 +0000

----------------------------------------------------------------------
 DISCLAIMER                                      | 13 +-----
 README                                          |  4 +-
 README.md                                       |  4 +-
 core/sqf/sql/scripts/install_apache_hadoop      |  4 +-
 core/sql/exp/exp_conv.cpp                       |  2 +-
 doap.rdf                                        |  6 +--
 docs/client_install/pom.xml                     | 10 ++---
 docs/command_interface/pom.xml                  | 10 ++---
 docs/cqd_reference/pom.xml                      | 10 ++---
 docs/jdbct4ref_guide/pom.xml                    | 10 ++---
 docs/load_transform/pom.xml                     | 10 ++---
 docs/lob_guide/pom.xml                          | 10 ++---
 .../lob_guide/src/asciidoc/_chapters/about.adoc |  4 +-
 docs/messages_guide/pom.xml                     | 10 ++---
 docs/odb_user/pom.xml                           | 10 ++---
 docs/provisioning_guide/pom.xml                 | 10 ++---
 docs/spj_guide/pom.xml                          | 10 ++---
 docs/sql_reference/pom.xml                      | 10 ++---
 docs/src/site/markdown/download.md              |  2 +-
 .../site/markdown/enable-secure-trafodion.md    |  2 +-
 docs/src/site/markdown/quickstart.md            |  2 +-
 docs/src/site/markdown/release-notes-1-0-1.md   |  2 +-
 pom.xml                                         | 44 ++++++++++----------
 tools/docker/Dockerfile                         |  2 +-
 tools/docker/start-compile-docker.sh            |  6 +--
 25 files changed, 98 insertions(+), 109 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
index 7f1f194..9fd36df 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -1,12 +1 @@
-Apache Trafodion is an effort undergoing incubation at The Apache Software 
-Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is 
-required of all newly accepted projects until a further review indicates that 
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation 
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-
-For more information about the incubation status of the Apache Trafodion see:
-   http://incubator.apache.org/projects/trafodion.html
-
-
+*** File To Be Removed - still referenced in packaging ***

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/README
----------------------------------------------------------------------
diff --git a/README b/README
index a8264c0..ce58dc5 100644
--- a/README
+++ b/README
@@ -18,14 +18,14 @@ To get started using Apache Trafodion:
   - release notes describing changes for particular releases can be viewed:
       http://trafodion.apache.org/release-notes.html
 
-  - the latest Apache Trafodion can be downloaded from Apache
+  - the latest Apache Trafodion can be downloaded from the Apache
     distribution site or accessed from git
 
     - download site:
       https://dist.apache.org/repos/dist/release/trafodion
 
     - git site:
-      git@github.com:apache/incubator-trafodion  
+      git@github.com:apache/trafodion  
 
   - To build and try out Apache Trafodion, please following our build 
     instructions as described:

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index fb84714..9e72337 100644
--- a/README.md
+++ b/README.md
@@ -20,14 +20,14 @@ Hadoop.
   
   http://trafodion.apache.org/release-notes.html
 
-  - the latest Apache Trafodion can be downloaded from Apache
+  - the latest Apache Trafodion can be downloaded from the Apache
     distribution site or accessed from git:
 
     - download site:
       https://dist.apache.org/repos/dist/release/trafodion
 
     - git site:
-      `git@github.com:apache/incubator-trafodion`
+      `git@github.com:apache/trafodion`
 
   - To build and try out Apache Trafodion, please following our build 
     instructions as described:

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/core/sqf/sql/scripts/install_apache_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_apache_hadoop b/core/sqf/sql/scripts/install_apache_hadoop
index 9316b56..dbbbd4e 100755
--- a/core/sqf/sql/scripts/install_apache_hadoop
+++ b/core/sqf/sql/scripts/install_apache_hadoop
@@ -1528,7 +1528,7 @@ cd $MY_SW_ROOT
 echo "Setting up DCS, REST and Phoenix tests..."
 
 #Default GIT location
-GIT_DIR="git@github.com:apache/incubator-trafodion"
+GIT_DIR="git@github.com:apache/trafodion"
 DCS_SRC=$TRAF_HOME/../../dcs
 
 if [ -d $DCS_SRC ]; then
@@ -1540,7 +1540,7 @@ if [ -d $DCS_SRC ]; then
    # Default location for phoenix_test
    PHX_SRC=$TRAF_HOME/../../tests/phx
 else
-   TRAF_SRC=$MY_SW_ROOT/src/incubator-trafodion
+   TRAF_SRC=$MY_SW_ROOT/src/trafodion
    if [ ! -d $TRAF_SRC ]; then
      mkdir -p $MY_SW_ROOT/src
      cd $MY_SW_ROOT/src

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/core/sql/exp/exp_conv.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/exp_conv.cpp b/core/sql/exp/exp_conv.cpp
index df1e608..81e0db0 100644
--- a/core/sql/exp/exp_conv.cpp
+++ b/core/sql/exp/exp_conv.cpp
@@ -2058,7 +2058,7 @@ ex_expr::exp_return_type convAsciiToInt64(Int64 &target,
       return ex_expr::EXPR_OK;
     }
   /* remove below code according to discussion in github
-   * https://github.com/apache/incubator-trafodion/pull/706
+   * https://github.com/apache/trafodion/pull/706
    * with above validation, below checking is no longer needed
    * comment out
   

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/doap.rdf
----------------------------------------------------------------------
diff --git a/doap.rdf b/doap.rdf
index 7c257a5..a65e102 100644
--- a/doap.rdf
+++ b/doap.rdf
@@ -26,7 +26,7 @@
     <license rdf:resource="http://spdx.org/licenses/Apache-2.0" />
     <name>Apache Trafodion</name>
     <homepage rdf:resource="http://trafodion.apache.org" />
-    <asfext:pmc rdf:resource="http://incubator.apache.org" />
+    <asfext:pmc rdf:resource="http://trafodion.apache.org" />
     <shortdesc>Webscale SQL-on-Hadoop solution enabling transactional or operational workloads on Apache Hadoop.</shortdesc>
     <description>Trafodion builds on the scalability, elasticity, and flexibility of Hadoop. Trafodion extends Hadoop to provide guaranteed transactional integrity, enabling new kinds of big data applications to run on Hadoop.</description>
     <bug-database rdf:resource="http://issues.apache.org/jira/browse/TRAFODION" />
@@ -36,8 +36,8 @@
     <category rdf:resource="http://projects.apache.org/category/big-data" />
     <repository>
       <GitRepository>
-        <location rdf:resource="http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git"/>
-        <browse rdf:resource="https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git"/>
+        <location rdf:resource="http://git-wip-us.apache.org/repos/asf/trafodion.git"/>
+        <browse rdf:resource="https://git-wip-us.apache.org/repos/asf?p=trafodion.git"/>
       </GitRepository>
     </repository>
     <maintainer>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/client_install/pom.xml
----------------------------------------------------------------------
diff --git a/docs/client_install/pom.xml b/docs/client_install/pom.xml
index bb75de5..48b4660 100644
--- a/docs/client_install/pom.xml
+++ b/docs/client_install/pom.xml
@@ -61,9 +61,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -187,7 +187,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <download-url>http://trafodion.apache.org/download.html</download-url>
                 <build-date>${maven.build.timestamp}</build-date>
@@ -217,7 +217,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <download-url>http://http://trafodion.apache.org/download.html</download-url>
                 <build-date>${maven.build.timestamp}</build-date>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/command_interface/pom.xml
----------------------------------------------------------------------
diff --git a/docs/command_interface/pom.xml b/docs/command_interface/pom.xml
index 9eba1d6..546216d 100644
--- a/docs/command_interface/pom.xml
+++ b/docs/command_interface/pom.xml
@@ -61,9 +61,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -187,7 +187,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -209,7 +209,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/cqd_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/cqd_reference/pom.xml b/docs/cqd_reference/pom.xml
index 2247918..609f657 100644
--- a/docs/cqd_reference/pom.xml
+++ b/docs/cqd_reference/pom.xml
@@ -63,9 +63,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -189,7 +189,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -211,7 +211,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/jdbct4ref_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/jdbct4ref_guide/pom.xml b/docs/jdbct4ref_guide/pom.xml
index 6f9a6fa..18bc5b2 100644
--- a/docs/jdbct4ref_guide/pom.xml
+++ b/docs/jdbct4ref_guide/pom.xml
@@ -61,9 +61,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -187,7 +187,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -216,7 +216,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
               </attributes>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/load_transform/pom.xml
----------------------------------------------------------------------
diff --git a/docs/load_transform/pom.xml b/docs/load_transform/pom.xml
index 2b7b379..ab05add 100644
--- a/docs/load_transform/pom.xml
+++ b/docs/load_transform/pom.xml
@@ -61,9 +61,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -187,7 +187,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -209,7 +209,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/lob_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/lob_guide/pom.xml b/docs/lob_guide/pom.xml
index 5704e20..9a7d7ce 100644
--- a/docs/lob_guide/pom.xml
+++ b/docs/lob_guide/pom.xml
@@ -61,9 +61,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -188,7 +188,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -210,7 +210,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/lob_guide/src/asciidoc/_chapters/about.adoc
----------------------------------------------------------------------
diff --git a/docs/lob_guide/src/asciidoc/_chapters/about.adoc b/docs/lob_guide/src/asciidoc/_chapters/about.adoc
index 167e308..b697827 100644
--- a/docs/lob_guide/src/asciidoc/_chapters/about.adoc
+++ b/docs/lob_guide/src/asciidoc/_chapters/about.adoc
@@ -190,6 +190,6 @@ match-value [NOT] LIKE _pattern
 
 == Comments Encouraged
 We encourage your comments concerning this document. We are committed to providing documentation that meets your
-needs. Send any errors found, suggestions for improvement, or compliments to user@trafodion.incubator.apache.org.
+needs. Send any errors found, suggestions for improvement, or compliments to user@trafodion.apache.org.
 
-Include the document title and any comment, error found, or suggestion for improvement you have concerning this document.
\ No newline at end of file
+Include the document title and any comment, error found, or suggestion for improvement you have concerning this document.

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/messages_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/messages_guide/pom.xml b/docs/messages_guide/pom.xml
index 20f1a47..d3d2595 100644
--- a/docs/messages_guide/pom.xml
+++ b/docs/messages_guide/pom.xml
@@ -60,9 +60,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -186,7 +186,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -208,7 +208,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/odb_user/pom.xml
----------------------------------------------------------------------
diff --git a/docs/odb_user/pom.xml b/docs/odb_user/pom.xml
index 0227708..8251ad9 100644
--- a/docs/odb_user/pom.xml
+++ b/docs/odb_user/pom.xml
@@ -60,9 +60,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -186,7 +186,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -208,7 +208,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/provisioning_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/provisioning_guide/pom.xml b/docs/provisioning_guide/pom.xml
index b6ee0d8..20bcb5a 100644
--- a/docs/provisioning_guide/pom.xml
+++ b/docs/provisioning_guide/pom.xml
@@ -61,9 +61,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -187,7 +187,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <download-url>http://trafodion.apache.org/download.html</download-url>
                 <build-date>${maven.build.timestamp}</build-date>
@@ -210,7 +210,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <download-url>http://trafodion.apache.org/download.html</download-url>
                 <build-date>${maven.build.timestamp}</build-date>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/spj_guide/pom.xml
----------------------------------------------------------------------
diff --git a/docs/spj_guide/pom.xml b/docs/spj_guide/pom.xml
index bba8f1e..46e4a15 100644
--- a/docs/spj_guide/pom.xml
+++ b/docs/spj_guide/pom.xml
@@ -61,9 +61,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -187,7 +187,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -216,7 +216,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
               </attributes>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/sql_reference/pom.xml
----------------------------------------------------------------------
diff --git a/docs/sql_reference/pom.xml b/docs/sql_reference/pom.xml
index 83edd20..0d6f3c8 100644
--- a/docs/sql_reference/pom.xml
+++ b/docs/sql_reference/pom.xml
@@ -63,9 +63,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -190,7 +190,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <google-analytics-account>UA-72491210-1</google-analytics-account>
@@ -212,7 +212,7 @@
                 <project-version>${env.TRAFODION_VER}</project-version>
                 <project-name>Trafodion</project-name>
                 <project-logo>${basedir}/../shared/trafodion-logo.jpg</project-logo>
-                <project-support>user@trafodion.incubator.apache.org</project-support>
+                <project-support>user@trafodion.apache.org</project-support>
                 <docs-url>http://trafodion.apache.org/docs</docs-url>
                 <build-date>${maven.build.timestamp}</build-date>
                 <pdf-stylesdir>${basedir}/../shared</pdf-stylesdir>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/src/site/markdown/download.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/download.md b/docs/src/site/markdown/download.md
index b974fb4..ac014b1 100644
--- a/docs/src/site/markdown/download.md
+++ b/docs/src/site/markdown/download.md
@@ -125,4 +125,4 @@ To build Trafodion from source code, see the [Trafodion Contributor Guide](https
 
 * * * *
 
-Note: when downloading from a mirror please check the [md5sum](http://www.apache.org/dev/release-signing#md5) and verify the [OpenPGP](http://www.apache.org/dev/release-signing#openpgp) compatible signature from the main [Apache](http://www.apache.org/) site. Links are provided above (next to the release download link). This [KEYS](http://www.apache.org/dist/incubator/trafodion/KEYS) file contains the public keys used for signing release. It is recommended that (when possible) a [web of trust](http://www.apache.org/dev/release-signing#web-of-trust) is used to confirm the identity of these keys. For more information, please see the [Apache Release FAQ](http://www.apache.org/dev/release.html).
+Note: when downloading from a mirror please check the [md5sum](http://www.apache.org/dev/release-signing#md5) and verify the [OpenPGP](http://www.apache.org/dev/release-signing#openpgp) compatible signature from the main [Apache](http://www.apache.org/) site. Links are provided above (next to the release download link). This [KEYS](http://www.apache.org/dist/trafodion/KEYS) file contains the public keys used for signing release. It is recommended that (when possible) a [web of trust](http://www.apache.org/dev/release-signing#web-of-trust) is used to confirm the identity of these keys. For more information, please see the [Apache Release FAQ](http://www.apache.org/dev/release.html).

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/src/site/markdown/enable-secure-trafodion.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/enable-secure-trafodion.md b/docs/src/site/markdown/enable-secure-trafodion.md
index c36cfcc..cc601f8 100644
--- a/docs/src/site/markdown/enable-secure-trafodion.md
+++ b/docs/src/site/markdown/enable-secure-trafodion.md
@@ -14,5 +14,5 @@
 -->
 
 Redirecting to the Trafodion Provisioning Guide...
-<p><meta http-equiv="refresh" content="0; url=http://trafodion.incubator.apache.org/docs/provisioning_guide/target/site/index.html#enable-security"></meta></p>
+<p><meta http-equiv="refresh" content="0; url=http://trafodion.apache.org/docs/provisioning_guide/target/site/index.html#enable-security"></meta></p>
 

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/src/site/markdown/quickstart.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/quickstart.md b/docs/src/site/markdown/quickstart.md
index bed136d..a2b138b 100644
--- a/docs/src/site/markdown/quickstart.md
+++ b/docs/src/site/markdown/quickstart.md
@@ -103,6 +103,6 @@ Trafodion provides connectivity services so that applications, tools, and other
 
 For more information, refer to the [Trafodion Documentation Page] (documentation.html) for starting points.  There is also a lot more information on the [Trafodion website] (http://trafodion.apache.org) and [Trafodion Wiki] (https://cwiki.apache.org/confluence/display/TRAFODION/Apache+Trafodion+Home) that you might refer to as you explore Trafodion.
 
-If you have questions or suggestions or just want to share what you've learned about Trafodion, you can contact a community of Trafodion users via the [Trafodion User Group mailing list](http://mail-archives.apache.org/mod_mbox/incubator-trafodion-user/) or other [Project Mailing Lists] (http://trafodion.apache.org/mail-lists.html)
+If you have questions or suggestions or just want to share what you've learned about Trafodion, you can contact a community of Trafodion users via the [Trafodion User Group mailing list](http://mail-archives.apache.org/mod_mbox/trafodion-user/) or other [Project Mailing Lists] (http://trafodion.apache.org/mail-lists.html)
 
 Have fun with Trafodion!

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/docs/src/site/markdown/release-notes-1-0-1.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/release-notes-1-0-1.md b/docs/src/site/markdown/release-notes-1-0-1.md
index 83b2544..61c4e86 100644
--- a/docs/src/site/markdown/release-notes-1-0-1.md
+++ b/docs/src/site/markdown/release-notes-1-0-1.md
@@ -247,4 +247,4 @@ To sample one percent of the rows, regardless of the table size, you must explic
 
 **Cause:** This is a day-one issue.
 
-**Solution:** Retry the query after two minutes. Set <code>CQD HIST_NO_STATS_REFRESH_INTERVAL</code> to '<code>0</code>'. Run an <code>UPDATE STATISTICS</code> statement. Perform DML operations in a different session.
\ No newline at end of file
+**Solution:** Retry the query after two minutes. Set <code>CQD HIST_NO_STATS_REFRESH_INTERVAL</code> to '<code>0</code>'. Run an <code>UPDATE STATISTICS</code> statement. Perform DML operations in a different session.

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 58257eb..cff1a4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,9 +63,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-trafodion.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=incubator-trafodion.git</url>
+    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/trafodion.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/trafodion.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf?p=trafodion.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -77,35 +77,35 @@
   <mailingLists>
     <mailingList>
       <name>User List</name>
-      <subscribe>user-subscribe@trafodion.incubator.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@trafodion.incubator.apache.org</unsubscribe>
-      <post>user@trafodion.incubator.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-trafodion-user/</archive>
+      <subscribe>user-subscribe@trafodion.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@trafodion.apache.org</unsubscribe>
+      <post>user@trafodion.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/trafodion-user/</archive>
     </mailingList>
     <mailingList>
       <name>Developer List</name>
-      <subscribe>dev-subscribe@trafodion.incubator.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@trafodion.incubator.apache.org</unsubscribe>
-      <post>dev@trafodion.incubator.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-trafodion-dev/</archive>
+      <subscribe>dev-subscribe@trafodion.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@trafodion.apache.org</unsubscribe>
+      <post>dev@trafodion.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/trafodion-dev/</archive>
     </mailingList>
     <mailingList>
       <name>GitHub Codereview List</name>
-      <subscribe>codereview-subscribe@trafodion.incubator.apache.org</subscribe>
-      <unsubscribe>codereview-unsubscribe@trafodion.incubator.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-trafodion-codereview/</archive>
+      <subscribe>codereview-subscribe@trafodion.apache.org</subscribe>
+      <unsubscribe>codereview-unsubscribe@trafodion.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/trafodion-codereview/</archive>
     </mailingList>
     <mailingList>
       <name>Commits List</name>
-      <subscribe>commits-subscribe@trafodion.incubator.apache.org</subscribe>
-      <unsubscribe>commits-unsubscribe@trafodion.incubator.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-trafodion-commits/</archive>
+      <subscribe>commits-subscribe@trafodion.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@trafodion.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/trafodion-commits/</archive>
     </mailingList>
     <mailingList>
       <name>Issues List</name>
-      <subscribe>issues-subscribe@trafodion.incubator.apache.org</subscribe>
-      <unsubscribe>issues-unsubscribe@trafodion.incubator.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/incubator-trafodion-issues/</archive>
+      <subscribe>issues-subscribe@trafodion.apache.org</subscribe>
+      <unsubscribe>issues-unsubscribe@trafodion.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/trafodion-issues/</archive>
     </mailingList>
   </mailingLists>
 
@@ -113,7 +113,7 @@
     <developer>
       <id>TrafodionDeveloper</id>
       <name>See list of Trafodion developers</name>
-      <email>dev@trafodion.incubator.apache.org</email>
+      <email>dev@trafodion.apache.org</email>
       <url>https://cwiki.apache.org/confluence/display/TRAFODION/Contributors</url>
     </developer>
   </developers>
@@ -121,7 +121,7 @@
   <contributors>
     <contributor>
       <name>See list of Trafodion contributors</name>
-      <email>dev@trafodion.incubator.apache.org</email>
+      <email>dev@trafodion.apache.org</email>
       <url>https://cwiki.apache.org/confluence/display/TRAFODION/Contributors</url>
     </contributor>
   </contributors>

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/tools/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 21cb98e..c849072 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 FROM centos:centos6.6
-MAINTAINER Trafodion Community <de...@trafodion.incubator.apache.org>
+MAINTAINER Trafodion Community <de...@trafodion.apache.org>
 
 LABEL Vendor="Apache Trafodion"
 LABEL version=unstable

http://git-wip-us.apache.org/repos/asf/trafodion/blob/b29118bb/tools/docker/start-compile-docker.sh
----------------------------------------------------------------------
diff --git a/tools/docker/start-compile-docker.sh b/tools/docker/start-compile-docker.sh
index f9697ec..74e3661 100755
--- a/tools/docker/start-compile-docker.sh
+++ b/tools/docker/start-compile-docker.sh
@@ -42,7 +42,7 @@ ENV HOME /home/${USER_NAME}
 RUN cd /home/${USER_NAME} \
  && mkdir download \
  && mkdir trafodion-build-tools \
- && wget https://raw.githubusercontent.com/apache/incubator-trafodion/master/install/traf_tools_setup.sh \
+ && wget https://raw.githubusercontent.com/apache/trafodion/master/install/traf_tools_setup.sh \
  && chmod +x traf_tools_setup.sh \
  && ./traf_tools_setup.sh -d ~/download -i ~/trafodion-build-tools \
  && rm -fr ./download \
@@ -56,9 +56,9 @@ pushd ${SCRIPT_DIR}/../..
 
 docker run -i -t \
   --rm=true \
-  -w "/home/${USER_NAME}/incubator-trafodion" \
+  -w "/home/${USER_NAME}/trafodion" \
   -u "${USER_NAME}" \
-  -v "$PWD:/home/${USER_NAME}/incubator-trafodion" \
+  -v "$PWD:/home/${USER_NAME}/trafodion" \
   -v "$HOME/.m2:/home/${USER_NAME}/.m2" \
   --name TrafodionEnv \
   ${IMAGE_NAME}-${USER_NAME} \