You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2012/06/12 17:51:37 UTC

[40/50] git commit: Updated in prep for 3.3.0 development

Updated in prep for 3.3.0 development


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

Branch: refs/heads/jpeach/lua
Commit: 618c87a7b4b34e432049fb4638e4fa518e785493
Parents: 84446dc
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Jun 8 15:57:37 2012 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Jun 8 15:57:37 2012 -0600

----------------------------------------------------------------------
 STATUS       |   11 ++++-------
 configure.ac |    4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/618c87a7/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 444a9c6..b18de62 100644
--- a/STATUS
+++ b/STATUS
@@ -1,4 +1,4 @@
-Traffic Server 3.1 STATUS:                                              -*-text-*-
+Traffic Server 3.3 STATUS:                                              -*-text-*-
 Last modified at [$Date$]
 
 The current version of this file can be found at:
@@ -10,13 +10,10 @@ Release history:
     [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
           while x.{even}.z versions are Stable/GA releases.]
 
-    3.1.4           : Released on June 06, 2012
-    3.1.3           : Released on March 21, 2012
-    3.1.2           : Released on February 08, 2012
-    3.1.1           : Released on November 18, 2011
-    3.1.0           : Released on August 25, 2011
+    3.3.0           : Released on X Y, 2012
 
-    3.0.5           : Released on May 11, 2012
+    3.2.0           : Released on June <x>, 2012
+    3.0.5           : Released on June 06, 2012
     3.0.4           : Released on March 21, 2012
     3.0.3           : Released on Februrary 13, 201
     3.0.2           : Released on December 07, 2011

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/618c87a7/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index c2f6ae3..94e93e2 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.1.5-unstable])
-m4_define([TS_VERSION_N],[3001005])
+m4_define([TS_VERSION_S],[3.3.0-dev])
+m4_define([TS_VERSION_N],[3003000])
 
 AC_INIT([Apache Traffic Server], TS_VERSION_S(), [dev@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org])
 AC_PREREQ([2.59])