You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2014/01/23 16:59:26 UTC
[1/2] git commit: TS-2172: Explicitly use subdir-objects in automake
init
Updated Branches:
refs/heads/4.1.x 2b9dd003b -> 5cdf04538
TS-2172: Explicitly use subdir-objects in automake init
now it is safe to enable subdir-objects for the automake
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bebda9f7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bebda9f7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bebda9f7
Branch: refs/heads/4.1.x
Commit: bebda9f791e908a7bb0a1563c450e5b01f4dde2c
Parents: 2b9dd00
Author: Zhao Yongming <mi...@gmail.com>
Authored: Tue Nov 5 12:13:44 2013 +0800
Committer: Igor Galić <i....@brainsware.org>
Committed: Thu Jan 23 16:55:09 2014 +0100
----------------------------------------------------------------------
CHANGES | 2 ++
configure.ac | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bebda9f7/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index f45494c..4a5d0c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@ Changes with Apache Traffic Server 4.1.3
*) [TS-2305] Fall back to ftruncate if posix_fallocate fails.
+ *) [TS-2712] Explicitly use subdir-objects in automake init.
+
*) [TS-2497] Failed post results in tunnel buffers being returned to
freelist prematurely.
Reporter: Thomas Jackson <th...@linkedin.com>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bebda9f7/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 910a822..3c8838c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR([build/aux])
AC_CONFIG_SRCDIR([proxy/Main.cc])
AC_CONFIG_MACRO_DIR([build])
-AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign no-installinfo no-installman 1.9.2])
+AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign no-installinfo no-installman subdir-objects 1.9.2])
AC_CONFIG_HEADERS([lib/ts/ink_autoconf.h])
# Configure with --disable-silent-rules to get verbose output. For more info, see
[2/2] git commit: bump version to 4.1.3
Posted by ig...@apache.org.
bump version to 4.1.3
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5cdf0453
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5cdf0453
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5cdf0453
Branch: refs/heads/4.1.x
Commit: 5cdf04538f41f3931e685df347f0036da5cb52bb
Parents: bebda9f
Author: Igor Galić <i....@brainsware.org>
Authored: Thu Jan 23 16:56:43 2014 +0100
Committer: Igor Galić <i....@brainsware.org>
Committed: Thu Jan 23 16:59:02 2014 +0100
----------------------------------------------------------------------
STATUS | 3 +++
configure.ac | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5cdf0453/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index 72ed550..b43cd59 100644
--- a/STATUS
+++ b/STATUS
@@ -8,6 +8,9 @@ The current version of this file can be found at:
Release history:
+ 4.1.3 : Released on Xyz ABcd, 2014
+ 4.1.2 : Released on Dec 17th, 2013
+
4.0.2 : Released on Oct 14th, 2013
4.0.1 : Released on Aug 30th, 2013
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5cdf0453/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 3c8838c..59ceaf8 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],[4.1.2])
-m4_define([TS_VERSION_N],[4001002])
+m4_define([TS_VERSION_S],[4.1.3])
+m4_define([TS_VERSION_N],[4001003])
AC_INIT([Apache Traffic Server], TS_VERSION_S(), [dev@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org])
AC_PREREQ([2.59])