[47/50] git commit: Bumped to 3.1.5, we can change this to 3.3.0 in case we don't release 3.1.5.

[jp...@apache.org]

Bumped to 3.1.5, we can change this to 3.3.0 in case we don't release 3.1.5.


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

Branch: refs/heads/jpeach/lua
Commit: 9a1fab3820212008cd9d6179fb059673d477cb5b
Parents: 2511fd5
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed May 30 11:53:31 2012 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed May 30 11:53:31 2012 -0600

----------------------------------------------------------------------
 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9a1fab38/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 9d68bae..c2f6ae3 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.4-unstable])
-m4_define([TS_VERSION_N],[3001004])
+m4_define([TS_VERSION_S],[3.1.5-unstable])
+m4_define([TS_VERSION_N],[3001005])
 
 AC_INIT([Apache Traffic Server], TS_VERSION_S(), [dev@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org])
 AC_PREREQ([2.59])