trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject git commit: Revert "TS-2172: Explicitly use subdir-objects in automake init"
Date Mon, 10 Mar 2014 22:32:58 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/4.1.x 7cb58971f -> ef46b2e88


Revert "TS-2172: Explicitly use subdir-objects in automake init"

This reverts commit bebda9f791e908a7bb0a1563c450e5b01f4dde2c.

The reason behind this revert is because it breaks all builds'
distclean. igalic.failcounter += 1

Conflicts:
	CHANGES


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

Branch: refs/heads/4.1.x
Commit: ef46b2e887e6a1042e41452b08eecdd74d7e64a3
Parents: 7cb5897
Author: Igor Galić <i.galic@brainsware.org>
Authored: Mon Mar 10 23:31:29 2014 +0100
Committer: Igor Galić <i.galic@brainsware.org>
Committed: Mon Mar 10 23:31:29 2014 +0100

----------------------------------------------------------------------
 CHANGES      | 2 --
 configure.ac | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ef46b2e8/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 60cf441..15428de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,8 +11,6 @@ Changes with Apache Traffic Server 4.1.3
   *) [TS-2469] remove libreadline which is gpl licensed.
    Author: Ben Aitchison <ben@meh.net.nz>
 
-  *) [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 <thjackso@linkedin.com>

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ef46b2e8/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 59ceaf8..1916a06 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 subdir-objects
1.9.2])
+AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign no-installinfo no-installman 1.9.2])
 AC_CONFIG_HEADERS([lib/ts/ink_autoconf.h])
 
 # Configure with --disable-silent-rules to get verbose output. For more info, see


Mime
View raw message