Repository: trafficserver Updated Branches: refs/heads/master 7c9525007 -> 65aee4dda
TS-3109: fix libhwloc linking on Ubuntu Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/65aee4dd Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/65aee4dd Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/65aee4dd Branch: refs/heads/master Commit: 65aee4ddaeb59ad374d00d14195aeecbc9eb461d Parents: 7c95250 Author: James Peach <[email protected]> Authored: Fri Oct 3 16:03:47 2014 -0700 Committer: James Peach <[email protected]> Committed: Fri Oct 3 16:07:56 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ cmd/traffic_layout/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/65aee4dd/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index a5ea322..4faf4f0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.2.0 + *) [TS-3109] Fix traffic_layout libhwloc linking on Ubuntu. + *) [TS-2314] - remove possible invalid array index access from debug log *) [TS-3112] - Add null pointer check for contp http://git-wip-us.apache.org/repos/asf/trafficserver/blob/65aee4dd/cmd/traffic_layout/Makefile.am ---------------------------------------------------------------------- diff --git a/cmd/traffic_layout/Makefile.am b/cmd/traffic_layout/Makefile.am index 64cd324..ea6d764 100644 --- a/cmd/traffic_layout/Makefile.am +++ b/cmd/traffic_layout/Makefile.am @@ -35,4 +35,4 @@ traffic_layout_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/proxy/shared/libUglyLogStubs.a \ $(top_builddir)/lib/ts/libtsutil.la \ - @LIBTCL@ + @LIBTCL@ @HWLOC_LIBS@
