Repository: trafficserver Updated Branches: refs/heads/master 929296988 -> ead727223
TS-2772: Clean up mgmt/preparse code that's unused Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ead72722 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ead72722 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ead72722 Branch: refs/heads/master Commit: ead727223d228b3a09d3c47acc819b3a55f3a8e5 Parents: 9292969 Author: Brian Geffon <[email protected]> Authored: Thu May 1 10:42:23 2014 -0700 Committer: Brian Geffon <[email protected]> Committed: Thu May 1 10:42:23 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ iocore/cache/Makefile.am | 1 - iocore/cluster/Makefile.am | 1 - iocore/dns/Makefile.am | 3 +-- iocore/hostdb/Makefile.am | 3 +-- iocore/net/Makefile.am | 1 - mgmt/Makefile.am | 4 +--- proxy/Makefile.am | 2 -- proxy/congest/Makefile.am | 2 +- proxy/http/Makefile.am | 2 +- proxy/logging/Makefile.am | 2 +- proxy/shared/Makefile.am | 1 - proxy/spdy/Makefile.am | 2 +- 13 files changed, 9 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index ba8e3f6..626e191 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,8 @@ Changes with Apache Traffic Server 5.0.0 *) [TS-2757] Fix logging crashes on reconfiguration. *) [TS-2770] Allow proxy.config.log.rolling_interval_sec to be as low as 60sec. + + *) [TS-2772] Clean up mgmt/preparse code *) [TS-2763] Remove the unused proxy.config.log.xuid_logging_enabled config setting. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/iocore/cache/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am index 82e9de5..026b384 100644 --- a/iocore/cache/Makefile.am +++ b/iocore/cache/Makefile.am @@ -28,7 +28,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy/shared \ -I$(top_srcdir)/proxy/http/remap \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/preparse \ -I$(top_srcdir)/mgmt/utils ADD_SRC = http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/iocore/cluster/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/cluster/Makefile.am b/iocore/cluster/Makefile.am index ccc0afc..7c5ba27 100644 --- a/iocore/cluster/Makefile.am +++ b/iocore/cluster/Makefile.am @@ -26,7 +26,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/proxy \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/preparse \ -I$(top_srcdir)/mgmt/utils noinst_LIBRARIES = libinkcluster.a http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/iocore/dns/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am index 5a002fd..59e85e2 100644 --- a/iocore/dns/Makefile.am +++ b/iocore/dns/Makefile.am @@ -25,8 +25,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy/http \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/utils \ - -I$(top_srcdir)/mgmt/preparse + -I$(top_srcdir)/mgmt/utils noinst_LIBRARIES = libinkdns.a http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/iocore/hostdb/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am index 1ad06f7..664135d 100644 --- a/iocore/hostdb/Makefile.am +++ b/iocore/hostdb/Makefile.am @@ -25,8 +25,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/proxy/http \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/utils \ - -I$(top_srcdir)/mgmt/preparse + -I$(top_srcdir)/mgmt/utils EXTRA_DIST = I_HostDB.h http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/iocore/net/Makefile.am ---------------------------------------------------------------------- diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am index 376ec9d..d7d3cc5 100644 --- a/iocore/net/Makefile.am +++ b/iocore/net/Makefile.am @@ -25,7 +25,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/proxy/shared \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/preparse \ -I$(top_srcdir)/mgmt/utils TESTS = $(check_PROGRAMS) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/mgmt/Makefile.am ---------------------------------------------------------------------- diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am index f0566a0..e562407 100644 --- a/mgmt/Makefile.am +++ b/mgmt/Makefile.am @@ -17,7 +17,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = cluster preparse utils web2 stats api +SUBDIRS = cluster utils web2 stats api # This is for traffic_manager only (local manager) AM_CPPFLAGS = $(ink_with_modules_local) \ @@ -30,7 +30,6 @@ AM_CPPFLAGS = $(ink_with_modules_local) \ -I$(top_srcdir)/mgmt \ -I$(top_srcdir)/mgmt/api/include \ -I$(top_srcdir)/mgmt/cluster \ - -I$(top_srcdir)/mgmt/preparse \ -I$(top_srcdir)/mgmt/stats \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/mgmt/web2 \ @@ -48,7 +47,6 @@ libmgmt_p_a_CPPFLAGS = \ $(iocore_include_dirs) \ -I$(top_srcdir)/mgmt/api/include \ -I$(top_srcdir)/mgmt/cluster \ - -I$(top_srcdir)/mgmt/preparse \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/mgmt/web2 \ -I$(top_srcdir)/proxy/api/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 5b753b2..fb80d4e 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -43,7 +43,6 @@ AM_CPPFLAGS = \ -I$(srcdir)/hdrs \ -I$(srcdir)/shared \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/preparse \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/proxy/api/ts \ -I$(top_srcdir)/lib @@ -199,7 +198,6 @@ traffic_server_LDADD = \ shared/libdiagsconfig.a \ shared/libsignals.a \ shared/libxml.a \ - $(top_builddir)/mgmt/preparse/libpreparse.a \ $(top_builddir)/mgmt/utils/libutils_p.a \ $(top_builddir)/mgmt/libmgmt_p.a \ $(top_builddir)/iocore/utils/libinkutils.a \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/proxy/congest/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/congest/Makefile.am b/proxy/congest/Makefile.am index 48a01c1..1d92ab9 100644 --- a/proxy/congest/Makefile.am +++ b/proxy/congest/Makefile.am @@ -24,7 +24,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy \ -I$(top_srcdir)/proxy/http \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/preparse \ + -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/proxy/shared \ -I$(top_srcdir)/proxy/hdrs http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/proxy/http/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am index b77604f..9a7842d 100644 --- a/proxy/http/Makefile.am +++ b/proxy/http/Makefile.am @@ -26,7 +26,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/lib/ts \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/preparse \ + -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/proxy/shared \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/proxy/logging/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am index 6fb9fcb..8be32e4 100644 --- a/proxy/logging/Makefile.am +++ b/proxy/logging/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy/hdrs \ -I$(top_srcdir)/proxy/shared \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/preparse \ + -I$(top_srcdir)/mgmt/utils EXTRA_DIST = LogStandalone.cc http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/proxy/shared/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am index 9fbdd16..afa0683 100644 --- a/proxy/shared/Makefile.am +++ b/proxy/shared/Makefile.am @@ -33,7 +33,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/api \ -I$(top_srcdir)/mgmt/api/include \ -I$(top_srcdir)/mgmt/cluster \ - -I$(top_srcdir)/mgmt/preparse \ -I$(top_srcdir)/mgmt/utils \ -I$(top_srcdir) \ -I$(top_srcdir)/proxy/api/ts \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ead72722/proxy/spdy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/spdy/Makefile.am b/proxy/spdy/Makefile.am index ec6e6e8..fdf818f 100644 --- a/proxy/spdy/Makefile.am +++ b/proxy/spdy/Makefile.am @@ -27,7 +27,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/proxy/shared \ -I$(top_srcdir)/proxy/spdy \ -I$(top_srcdir)/mgmt \ - -I$(top_srcdir)/mgmt/preparse \ + -I$(top_srcdir)/mgmt/utils \ @SPDYLAY_CFLAGS@
