You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2014/03/27 18:01:29 UTC

[3/4] git commit: [#7277] Remove "incubating" references

[#7277] Remove "incubating" references

Signed-off-by: Cory Johns <cj...@slashdotmedia.com>


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

Branch: refs/heads/cj/7277
Commit: cb78d4554172210cfea05c14fc12fdb2b6b9fa23
Parents: 829f967
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Wed Mar 26 18:53:14 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Mar 26 20:20:38 2014 +0000

----------------------------------------------------------------------
 Allura/allura/templates/jinja_master/theme_macros.html | 2 +-
 Allura/docs/conf.py                                    | 2 +-
 ForgeImporters/docs/conf.py                            | 2 +-
 scripts/asf-release.sh                                 | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/cb78d455/Allura/allura/templates/jinja_master/theme_macros.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index f188692..17702dd 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -36,7 +36,7 @@
 {%- macro footer(year, path_to_static='') %}
 <footer id="site-footer">
   <nav>
-      <p>This project is powered by <a href="https://forge-allura.apache.org/p/allura/">Apache Allura (incubating)</a>.</p>
+      <p>This project is powered by <a href="https://forge-allura.apache.org/p/allura/">Apache Allura</a>.</p>
       <p>
       Copyright &copy; 2014 The Apache Software Foundation, Licensed under the
       <a style="color: #069;" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>

http://git-wip-us.apache.org/repos/asf/allura/blob/cb78d455/Allura/docs/conf.py
----------------------------------------------------------------------
diff --git a/Allura/docs/conf.py b/Allura/docs/conf.py
index 081dd0c..14651da 100644
--- a/Allura/docs/conf.py
+++ b/Allura/docs/conf.py
@@ -53,7 +53,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = 'Apache Allura (incubating)'
+project = 'Apache Allura'
 copyright = '2012-2014 The Apache Software Foundation'
 
 # The version info for the project you're documenting, acts as replacement for

http://git-wip-us.apache.org/repos/asf/allura/blob/cb78d455/ForgeImporters/docs/conf.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/docs/conf.py b/ForgeImporters/docs/conf.py
index 26fc1b9..7783282 100644
--- a/ForgeImporters/docs/conf.py
+++ b/ForgeImporters/docs/conf.py
@@ -53,7 +53,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = 'Apache Allura (incubating)'
+project = 'Apache Allura'
 copyright = '2012-2014 The Apache Software Foundation'
 
 # The version info for the project you're documenting, acts as replacement for

http://git-wip-us.apache.org/repos/asf/allura/blob/cb78d455/scripts/asf-release.sh
----------------------------------------------------------------------
diff --git a/scripts/asf-release.sh b/scripts/asf-release.sh
index 19ac9e5..b33c47d 100755
--- a/scripts/asf-release.sh
+++ b/scripts/asf-release.sh
@@ -35,7 +35,7 @@ PREV_VERSION=`git tag -l asf_release_* | sort -rn | head -1 | sed -e 's/^asf_rel
 VERSION=`echo $PREV_VERSION | perl -pe '@_ = split /\./; $_[-1]++; $_ = join ".", @_'`
 prompt VERSION "Version" "$VERSION"
 
-RELEASE_BASE=allura-incubating-$VERSION
+RELEASE_BASE=allura-$VERSION
 RELEASE_DIR=$RELEASE_DIR_BASE/$RELEASE_BASE
 RELEASE_FILENAME=$RELEASE_BASE.tar.gz
 RELEASE_FILE=$RELEASE_DIR/$RELEASE_FILENAME
@@ -76,12 +76,12 @@ echo "    git push"
 echo "    git push --tags"
 echo "Then upload the files and signatures, and post the following:"
 echo "-------------------------------------------------------------"
-echo "Subject: [VOTE] Release of Apache Allura $VERSION (incubating)"
+echo "Subject: [VOTE] Release of Apache Allura $VERSION"
 echo "-------------------------------------------------------------"
 cat <<EOF
 Hello,
 
-This is a call for a vote on Apache Allura $VERSION incubating.
+This is a call for a vote on Apache Allura $VERSION.
 
 Source tarball, signature and checksums are available at:
   https://dist.apache.org/repos/dist/dev/incubator/allura/