Updated Branches:
  refs/heads/master e1b4b11ce -> d242aa4d8

Updated with the new release process changes


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

Branch: refs/heads/master
Commit: d242aa4d80918e1899e1dcbab6e14d8344b25ae1
Parents: e1b4b11
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Aug 21 13:17:29 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Aug 21 13:17:31 2013 -0600

----------------------------------------------------------------------
 STATUS       | 24 +++++++++++-------------
 configure.ac |  4 ++--
 2 files changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d242aa4d/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 2987880..ae6370c 100644
--- a/STATUS
+++ b/STATUS
@@ -1,4 +1,4 @@
-Traffic Server 3.3 STATUS:                                              
-*-text-*-
+Traffic Server 4.1 STATUS:                                              
-*-text-*-
 Last modified at [$Date$]
 
 The current version of this file can be found at:
@@ -7,9 +7,10 @@ The current version of this file can be found at:
 
 
 Release history:
-    [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
-          while x.{even}.z versions are Stable/GA releases.]
 
+    4.0.0           : Released on Aug 30th, 2013
+
+    3.3.5           : Released on Aug 16th, 2013
     3.3.4           : Released on June 10th, 2013
     3.3.2           : Released on April 18th, 2013
     3.3.1           : Released on March 12th, 2013
@@ -38,26 +39,23 @@ Contributors looking for a mission:
   * Open bugs in the bug database.
 
 
-RELEASE SHOWSTOPPERS:
+UPCOMING WORK:
 
-A list of all bugs open for the next development release can be found at
+A list of all bugs open for the next release can be found at
 
-  http://s.apache.org/ts-3.3.4
+  http://s.apache.org/ats-next
 
 
 RELEASE PROCESS
 
-The Traffic Server release process is documented at
-
-    http://cwiki.apache.org/confluence/display/TS/ReleaseProcess
+The Traffic Server release process and support cycles are documented at
 
-The Traffic Server backport process is documented at
+    https://cwiki.apache.org/confluence/display/TS/ReleaseProcess
 
-    http://cwiki.apache.org/confluence/display/TS/Development+Process
+and
 
-The Traffic Server Road-Map and support cycles are documented at
+    https://cwiki.apache.org/confluence/display/TS/New+Release+Processes
 
-    https://cwiki.apache.org/confluence/display/TS/Release+and+Support+cycles
 
 Current status of all build systems is available at
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d242aa4d/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index c95ab43..015380e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@
 # Version number is calculated as MAJOR * 1000000 + MINOR * 1000 + MICRO
 # Version string is in the form of MAJOR.MINOR.MICRO[sufix]
 #
-m4_define([TS_VERSION_S],[3.5.0-dev])
-m4_define([TS_VERSION_N],[3005000])
+m4_define([TS_VERSION_S],[4.1.0])
+m4_define([TS_VERSION_N],[4001000])
 
 AC_INIT([Apache Traffic Server], TS_VERSION_S(), 
[d...@trafficserver.apache.org], 
[trafficserver],[http://trafficserver.apache.org])
 AC_PREREQ([2.59])

Reply via email to