You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by da...@apache.org on 2018/04/26 21:14:14 UTC

[trafficserver] branch master updated: Updates editorconfig files & normalizes white-space

This is an automated email from the ASF dual-hosted git repository.

dagit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new b67a1b5  Updates editorconfig files & normalizes white-space
b67a1b5 is described below

commit b67a1b5dd6f969a20981b12634cae2c6df305d6f
Author: Derek Dagit <de...@oath.com>
AuthorDate: Thu Apr 26 13:30:42 2018 -0500

    Updates editorconfig files & normalizes white-space
---
 .editorconfig                                      |   5 +-
 cmd/Makefile.am                                    |  16 +-
 cmd/traffic_cop/Makefile.am                        |  24 +-
 cmd/traffic_crashlog/Makefile.am                   |  36 +-
 cmd/traffic_ctl/Makefile.am                        |  42 +--
 cmd/traffic_layout/Makefile.am                     |  40 +--
 cmd/traffic_manager/Makefile.am                    |  92 +++---
 cmd/traffic_top/Makefile.am                        |  38 +--
 cmd/traffic_via/Makefile.am                        |  18 +-
 cmd/traffic_wccp/Makefile.am                       |  26 +-
 doc/Makefile.am                                    |   8 +-
 doc/uml/Makefile.am                                |  12 +-
 example/thread_pool/include/Makefile.am            |   2 +-
 iocore/aio/Makefile.am                             |  54 +--
 iocore/cache/Makefile.am                           |  80 ++---
 iocore/dns/Makefile.am                             |  46 +--
 iocore/eventsystem/Makefile.am                     | 136 ++++----
 iocore/hostdb/Makefile.am                          |  72 ++--
 iocore/net/Makefile.am                             | 244 +++++++-------
 iocore/utils/Makefile.am                           |  20 +-
 lib/bindings/Makefile.am                           |  24 +-
 lib/records/Makefile.am                            |  82 ++---
 lib/ts/Makefile.am                                 | 350 ++++++++++----------
 lib/tsconfig/Makefile.am                           |  42 +--
 lib/wccp/Makefile.am                               |  24 +-
 mgmt/Makefile.am                                   |  70 ++--
 mgmt/api/Makefile.am                               |  78 ++---
 mgmt/api/include/Makefile.am                       |   2 +-
 mgmt/utils/Makefile.am                             |  52 +--
 proxy/Makefile.am                                  | 366 ++++++++++-----------
 proxy/api/ts/Makefile.am                           |   8 +-
 proxy/config/Makefile.am                           |  38 +--
 proxy/config/body_factory/default/Makefile.am      |  54 +--
 proxy/congest/Makefile.am                          |  36 +-
 proxy/hdrs/Makefile.am                             |  70 ++--
 proxy/http/Makefile.am                             | 112 +++----
 proxy/http/remap/Makefile.am                       |  52 +--
 proxy/http2/Makefile.am                            | 112 +++----
 proxy/logging/Makefile.am                          | 112 +++----
 proxy/shared/Makefile.am                           |  34 +-
 rc/Makefile.am                                     |   2 +-
 .../gold_tests/autest-site/.editorconfig           |  21 +-
 tests/unit_tests/Makefile.am                       |   4 +-
 tools/Makefile.am                                  |  18 +-
 44 files changed, 1379 insertions(+), 1395 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 2602276..d2260bf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -37,7 +37,8 @@ charset = utf-8
 [{*.pm,*.pl}]
 indent_size = 4
 charset = utf-8
-# Automake files. TODO: Should this do indent_style = tab ?
 [*.am]
 trim_trailing_whitespace = false
-indent_size = 2
+indent_style = tab
+[*.rst]
+max_line_length = 80
diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index 3d770e6..481631d 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -16,14 +16,14 @@
 #  limitations under the License.
 
 SUBDIRS = \
-  traffic_cache_tool \
-  traffic_cop \
-  traffic_crashlog \
-  traffic_ctl \
-  traffic_layout \
-  traffic_manager \
-  traffic_top \
-  traffic_via
+	traffic_cache_tool \
+	traffic_cop \
+	traffic_crashlog \
+	traffic_ctl \
+	traffic_layout \
+	traffic_manager \
+	traffic_top \
+	traffic_via
 
 TESTS = $(check_PROGRAMS)
 
diff --git a/cmd/traffic_cop/Makefile.am b/cmd/traffic_cop/Makefile.am
index a8d7965..e2da4ad 100644
--- a/cmd/traffic_cop/Makefile.am
+++ b/cmd/traffic_cop/Makefile.am
@@ -18,26 +18,26 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	$(TS_INCLUDES)
 
 AM_LDFLAGS += \
-  @OPENSSL_LDFLAGS@
+	@OPENSSL_LDFLAGS@
 
 bin_PROGRAMS = traffic_cop
 
 traffic_cop_SOURCES = \
-  traffic_cop.cc
+	traffic_cop.cc
 
 traffic_cop_LDADD = \
-  $(top_builddir)/mgmt/libmgmt_c.la \
-  $(top_builddir)/mgmt/api/libtsmgmt.la \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/lib/records/librecords_cop.a
+	$(top_builddir)/mgmt/libmgmt_c.la \
+	$(top_builddir)/mgmt/api/libtsmgmt.la \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/lib/records/librecords_cop.a
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/cmd/traffic_crashlog/Makefile.am b/cmd/traffic_crashlog/Makefile.am
index 29006de..cd8305f 100644
--- a/cmd/traffic_crashlog/Makefile.am
+++ b/cmd/traffic_crashlog/Makefile.am
@@ -18,30 +18,30 @@
 bin_PROGRAMS = traffic_crashlog
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	$(TS_INCLUDES)
 
 AM_LDFLAGS += \
-  @OPENSSL_LDFLAGS@
+	@OPENSSL_LDFLAGS@
 
 traffic_crashlog_SOURCES = \
-  procinfo.cc \
-  traffic_crashlog.cc \
-  traffic_crashlog.h
+	procinfo.cc \
+	traffic_crashlog.cc \
+	traffic_crashlog.h
 
 traffic_crashlog_LDADD = \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/mgmt/api/libtsmgmt.la \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTCL@ @HWLOC_LIBS@
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/mgmt/api/libtsmgmt.la \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	@LIBTCL@ @HWLOC_LIBS@
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/cmd/traffic_ctl/Makefile.am b/cmd/traffic_ctl/Makefile.am
index 905916d..b9d8424 100644
--- a/cmd/traffic_ctl/Makefile.am
+++ b/cmd/traffic_ctl/Makefile.am
@@ -18,33 +18,33 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	$(TS_INCLUDES)
 
 bin_PROGRAMS = traffic_ctl
 
 traffic_ctl_SOURCES = \
-  alarm.cc \
-  config.cc \
-  metric.cc \
-  plugin.cc \
-  server.cc \
-  storage.cc \
-  host.cc \
-  traffic_ctl.cc
+	alarm.cc \
+	config.cc \
+	metric.cc \
+	plugin.cc \
+	server.cc \
+	storage.cc \
+	host.cc \
+	traffic_ctl.cc
 
 traffic_ctl_LDADD = \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
-  $(top_builddir)/mgmt/api/libtsmgmt.la \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTCL@ @HWLOC_LIBS@
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
+	$(top_builddir)/mgmt/api/libtsmgmt.la \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	@LIBTCL@ @HWLOC_LIBS@
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/cmd/traffic_layout/Makefile.am b/cmd/traffic_layout/Makefile.am
index e6b0c8c..ccae509 100644
--- a/cmd/traffic_layout/Makefile.am
+++ b/cmd/traffic_layout/Makefile.am
@@ -18,32 +18,32 @@
 bin_PROGRAMS = traffic_layout
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	$(TS_INCLUDES)
 
 AM_LDFLAGS += \
-  @OPENSSL_LDFLAGS@
+	@OPENSSL_LDFLAGS@
 
 traffic_layout_SOURCES = \
-  traffic_layout.cc \
-  file_system.cc \
-  file_system.h \
-  engine.cc \
-  engine.h \
-  info.cc \
-  info.h
+	traffic_layout.cc \
+	file_system.cc \
+	file_system.h \
+	engine.cc \
+	engine.h \
+	info.cc \
+	info.h
 
 traffic_layout_LDADD = \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTCL@ @HWLOC_LIBS@
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	@LIBTCL@ @HWLOC_LIBS@
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am
index 3e56ffd..2c1ec47 100644
--- a/cmd/traffic_manager/Makefile.am
+++ b/cmd/traffic_manager/Makefile.am
@@ -21,88 +21,88 @@ check_PROGRAMS = test_metrics
 TESTS = $(check_PROGRAMS)
 
 AM_CPPFLAGS += \
-  $(LUAJIT_CPPFLAGS) \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/shared \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/api \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/lib \
-  $(TS_INCLUDES)
+	$(LUAJIT_CPPFLAGS) \
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/shared \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/api \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/lib \
+	$(TS_INCLUDES)
 
 if BUILD_LUAJIT
 AM_CPPFLAGS += \
-  -I$(abs_top_srcdir)/lib/luajit/src
+	-I$(abs_top_srcdir)/lib/luajit/src
 endif
 
 AM_LDFLAGS += \
-  @OPENSSL_LDFLAGS@
+	@OPENSSL_LDFLAGS@
 
 traffic_manager_SOURCES = \
-  AddConfigFilesHere.cc \
-  MgmtHandlers.cc \
-  MgmtHandlers.h \
-  metrics.h \
-  traffic_manager.cc
+	AddConfigFilesHere.cc \
+	MgmtHandlers.cc \
+	MgmtHandlers.h \
+	metrics.h \
+	traffic_manager.cc
 
 traffic_manager_LDADD = \
-  $(top_builddir)/mgmt/api/libmgmtapilocal.la \
-  $(top_builddir)/mgmt/libmgmt_lm.la \
-  $(top_builddir)/proxy/hdrs/libhdrs.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/records/librecords_lm.a \
-  $(top_builddir)/proxy/shared/libdiagsconfig.a
+	$(top_builddir)/mgmt/api/libmgmtapilocal.la \
+	$(top_builddir)/mgmt/libmgmt_lm.la \
+	$(top_builddir)/proxy/hdrs/libhdrs.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/records/librecords_lm.a \
+	$(top_builddir)/proxy/shared/libdiagsconfig.a
 
 AM_LDFLAGS += \
-  $(LUAJIT_LDFLAGS)
+	$(LUAJIT_LDFLAGS)
 
 traffic_manager_SOURCES += \
-  metrics.cc
+	metrics.cc
 
 traffic_manager_LDADD += \
-  $(top_builddir)/lib/bindings/libbindings.la
+	$(top_builddir)/lib/bindings/libbindings.la
 
 if BUILD_LUAJIT
 traffic_manager_LDADD += \
-  $(top_builddir)/lib/luajit/src/libluajit.a
+	$(top_builddir)/lib/luajit/src/libluajit.a
 endif
 
 if SYSTEM_LUAJIT
 traffic_manager_LDADD +=\
-  @LIBLUAJIT@
+	@LIBLUAJIT@
 endif
 
 traffic_manager_LDADD +=\
-  $(LIBUNWIND_LIBS) \
-  @LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ \
-  -lm
+	$(LIBUNWIND_LIBS) \
+	@LIBPCRE@ @LIBTCL@ @LIBCAP@ @HWLOC_LIBS@ \
+	-lm
 
 test_metrics_SOURCES = test_metrics.cc metrics.cc
 test_metrics_LDADD = \
-  $(top_builddir)/mgmt/libmgmt_lm.la \
-  $(top_builddir)/lib/records/librecords_lm.a \
-  $(top_builddir)/lib/bindings/libbindings.la \
-  $(top_builddir)/lib/luajit/src/libluajit.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  @LIBTCL@ @LIBPCRE@
+	$(top_builddir)/mgmt/libmgmt_lm.la \
+	$(top_builddir)/lib/records/librecords_lm.a \
+	$(top_builddir)/lib/bindings/libbindings.la \
+	$(top_builddir)/lib/luajit/src/libluajit.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	@LIBTCL@ @LIBPCRE@
 
 # Must do it this way or the dependencies aren't detected.
 if BUILD_WCCP
 
 traffic_manager_LDADD += \
-  $(top_builddir)/lib/wccp/libwccp.a \
-  $(top_builddir)/lib/tsconfig/libtsconfig.la \
-  @OPENSSL_LIBS@
+	$(top_builddir)/lib/wccp/libwccp.a \
+	$(top_builddir)/lib/tsconfig/libtsconfig.la \
+	@OPENSSL_LIBS@
 
 test_metrics_LDADD += \
-  $(top_builddir)/lib/wccp/libwccp.a \
-  $(top_builddir)/lib/tsconfig/libtsconfig.la \
-  @OPENSSL_LIBS@
+	$(top_builddir)/lib/wccp/libwccp.a \
+	$(top_builddir)/lib/tsconfig/libtsconfig.la \
+	@OPENSSL_LIBS@
 
 endif
 
diff --git a/cmd/traffic_top/Makefile.am b/cmd/traffic_top/Makefile.am
index edb103d..ad0eb90 100644
--- a/cmd/traffic_top/Makefile.am
+++ b/cmd/traffic_top/Makefile.am
@@ -19,33 +19,33 @@
 if BUILD_TRAFFIC_TOP
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  $(TS_INCLUDES) \
-  @CURL_CFLAGS@ \
-  @CURSES_CFLAGS@
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	$(TS_INCLUDES) \
+	@CURL_CFLAGS@ \
+	@CURSES_CFLAGS@
 
 AM_LDFLAGS += \
-  @CURSES_LDFLAGS@ \
-  @OPENSSL_LDFLAGS@
+	@CURSES_LDFLAGS@ \
+	@OPENSSL_LDFLAGS@
 
 bin_PROGRAMS = traffic_top
 
 traffic_top_SOURCES = traffic_top.cc
 
 traffic_top_LDADD = \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
-  $(top_builddir)/mgmt/api/libtsmgmt.la \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  @CURL_LIBS@ \
-  @CURSES_LIBS@ \
-  @LIBTCL@ @HWLOC_LIBS@
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
+	$(top_builddir)/mgmt/api/libtsmgmt.la \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	@CURL_LIBS@ \
+	@CURSES_LIBS@ \
+	@LIBTCL@ @HWLOC_LIBS@
 
 endif
 
diff --git a/cmd/traffic_via/Makefile.am b/cmd/traffic_via/Makefile.am
index cb19705..63475c9 100644
--- a/cmd/traffic_via/Makefile.am
+++ b/cmd/traffic_via/Makefile.am
@@ -18,25 +18,25 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	$(TS_INCLUDES)
 
 AM_LDFLAGS += \
-  @OPENSSL_LDFLAGS@
+	@OPENSSL_LDFLAGS@
 
 bin_PROGRAMS = traffic_via
 
 traffic_via_SOURCES = \
-  traffic_via.cc
+	traffic_via.cc
 
 traffic_via_LDADD = \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBPCRE@
+	$(top_builddir)/lib/ts/libtsutil.la \
+	@LIBPCRE@
 
 TESTS = \
-  test_traffic_via
+	test_traffic_via
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/cmd/traffic_wccp/Makefile.am b/cmd/traffic_wccp/Makefile.am
index a1a270d..fcc5b1b 100644
--- a/cmd/traffic_wccp/Makefile.am
+++ b/cmd/traffic_wccp/Makefile.am
@@ -18,27 +18,27 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/lib/wccp \
-  $(TS_INCLUDES) \
-  @OPENSSL_INCLUDES@
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/lib/wccp \
+	$(TS_INCLUDES) \
+	@OPENSSL_INCLUDES@
 
 AM_LDFLAGS += \
-  @OPENSSL_LDFLAGS@
+	@OPENSSL_LDFLAGS@
 
 bin_PROGRAMS = traffic_wccp
 
 traffic_wccp_SOURCES = \
-  wccp_client.cc
+	wccp_client.cc
 
 traffic_wccp_LDADD = \
-  $(top_builddir)/lib/tsconfig/libtsconfig.la \
-  $(top_builddir)/lib/wccp/libwccp.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/lib/luajit/src/libluajit.a \
-  @OPENSSL_LIBS@
+	$(top_builddir)/lib/tsconfig/libtsconfig.la \
+	$(top_builddir)/lib/wccp/libwccp.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/lib/luajit/src/libluajit.a \
+	@OPENSSL_LIBS@
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 59d3b5b..97553ed 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -61,10 +61,10 @@ I18NSPHINXOPTS  = $(SPHINXOPTS)
 # The PAPER setting variables requires recursive make variable expansion, which automake
 # detects as non-portable. We bounce this through a shell script and do the expansion there.
 SBUILD = PAPEROPT_a4="$(PAPEROPT_a4)" PAPEROPT_letter="$(PAPEROPT_letter)" PAPER="$(PAPER)" \
-         PLANTUML_JAR="$(shell ./plantuml_fetch.sh | tail -1)" \
-	 $(srcdir)/sbuild $(SPHINXBUILD) \
-	 -c $(srcdir) \
-	 $(ALLSPHINXOPTS)
+	PLANTUML_JAR="$(shell ./plantuml_fetch.sh | tail -1)" \
+	$(srcdir)/sbuild $(SPHINXBUILD) \
+	-c $(srcdir) \
+	$(ALLSPHINXOPTS)
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
diff --git a/doc/uml/Makefile.am b/doc/uml/Makefile.am
index 0026891..70f3c6d 100644
--- a/doc/uml/Makefile.am
+++ b/doc/uml/Makefile.am
@@ -46,12 +46,12 @@ clean-local:
 
 jar-check:
 	@if [ -z "$(PLANTUML_JAR)" ] ; then \
-	  echo plantuml jar file variable not set.; \
-	  exit 1; \
+		echo plantuml jar file variable not set.; \
+		exit 1; \
 	elif [ ! -r "$(PLANTUML_JAR)" ] ; then \
-	  echo plantuml jar \'${PLANTUML_JAR}\' not readable.; \
-	  exit 1; \
+		echo plantuml jar \'${PLANTUML_JAR}\' not readable.; \
+		exit 1; \
 	elif [ -d "${PLANTUML_JAR}" ] ; then \
-	  echo plantuml jar not downloaded to \'${PLANTUML_JAR}\'.; \
-	  exit 1; \
+		echo plantuml jar not downloaded to \'${PLANTUML_JAR}\'.; \
+		exit 1; \
 	fi
diff --git a/example/thread_pool/include/Makefile.am b/example/thread_pool/include/Makefile.am
index 7eefc11..b6f4351 100644
--- a/example/thread_pool/include/Makefile.am
+++ b/example/thread_pool/include/Makefile.am
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-all:  gen
+all: gen
 
 gen: gen.c
 	$(CC) -o gen gen.c
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index fe0c187..5b69872 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -17,10 +17,10 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  -I$(abs_top_srcdir)/iocore/eventsystem \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  $(TS_INCLUDES)
+	-I$(abs_top_srcdir)/iocore/eventsystem \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	$(TS_INCLUDES)
 
 TESTS = test_AIO.sample
 
@@ -28,37 +28,37 @@ noinst_LIBRARIES = libinkaio.a
 check_PROGRAMS = test_AIO
 
 libinkaio_a_SOURCES = \
-  AIO.cc \
-  I_AIO.h \
-  Inline.cc \
-  P_AIO.h
+	AIO.cc \
+	I_AIO.h \
+	Inline.cc \
+	P_AIO.h
 
 test_AIO_LDFLAGS = \
-  @AM_LDFLAGS@ \
-  @OPENSSL_LDFLAGS@
+	@AM_LDFLAGS@ \
+	@OPENSSL_LDFLAGS@
 
 test_AIO_SOURCES = \
-  test_AIO.cc
+	test_AIO.cc
 
 test_AIO_CPPFLAGS = \
-  $(AM_CPPFLAGS) \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/proxy/logging \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  @OPENSSL_INCLUDES@
+	$(AM_CPPFLAGS) \
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/proxy/logging \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	@OPENSSL_INCLUDES@
 
 test_AIO_LDADD = \
-  libinkaio.a \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
-  @LIBTCL@ @HWLOC_LIBS@
+	libinkaio.a \
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
+	@LIBTCL@ @HWLOC_LIBS@
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/iocore/cache/Makefile.am b/iocore/cache/Makefile.am
index 78eb2cc..3700d2c 100644
--- a/iocore/cache/Makefile.am
+++ b/iocore/cache/Makefile.am
@@ -17,53 +17,53 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/proxy/shared \
-  -I$(abs_top_srcdir)/proxy/http/remap \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/proxy/shared \
+	-I$(abs_top_srcdir)/proxy/http/remap \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	$(TS_INCLUDES)
 
 noinst_LIBRARIES = libinkcache.a
 
 libinkcache_a_SOURCES = \
-  Cache.cc \
-  CacheDir.cc \
-  CacheDisk.cc \
-  CacheHosting.cc \
-  CacheHttp.cc \
-  CacheLink.cc \
-  CachePages.cc \
-  CachePagesInternal.cc \
-  CacheRead.cc \
-  CacheVol.cc \
-  CacheWrite.cc \
-  I_Cache.h \
-  I_CacheDefs.h \
-  I_Store.h \
-  Inline.cc \
-  P_Cache.h \
-  P_CacheArray.h \
-  P_CacheDir.h \
-  P_CacheDisk.h \
-  P_CacheHosting.h \
-  P_CacheHttp.h \
-  P_CacheInternal.h \
-  P_CacheVol.h \
-  P_RamCache.h \
-  RamCacheCLFUS.cc \
-  RamCacheLRU.cc \
-  Store.cc
+	Cache.cc \
+	CacheDir.cc \
+	CacheDisk.cc \
+	CacheHosting.cc \
+	CacheHttp.cc \
+	CacheLink.cc \
+	CachePages.cc \
+	CachePagesInternal.cc \
+	CacheRead.cc \
+	CacheVol.cc \
+	CacheWrite.cc \
+	I_Cache.h \
+	I_CacheDefs.h \
+	I_Store.h \
+	Inline.cc \
+	P_Cache.h \
+	P_CacheArray.h \
+	P_CacheDir.h \
+	P_CacheDisk.h \
+	P_CacheHosting.h \
+	P_CacheHttp.h \
+	P_CacheInternal.h \
+	P_CacheVol.h \
+	P_RamCache.h \
+	RamCacheCLFUS.cc \
+	RamCacheLRU.cc \
+	Store.cc
 
 if BUILD_TESTS
 libinkcache_a_SOURCES += \
-  CacheTest.cc \
-  P_CacheTest.h
+	CacheTest.cc \
+	P_CacheTest.h
 endif
 
 include $(top_srcdir)/build/tidy.mk
diff --git a/iocore/dns/Makefile.am b/iocore/dns/Makefile.am
index 3258279..e4fa076 100644
--- a/iocore/dns/Makefile.am
+++ b/iocore/dns/Makefile.am
@@ -17,33 +17,33 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	$(TS_INCLUDES)
 
 noinst_LIBRARIES = libinkdns.a
 
 libinkdns_a_SOURCES = \
-  DNS.cc \
-  DNSConnection.cc \
-  I_DNS.h \
-  I_DNSProcessor.h \
-  I_SplitDNS.h \
-  I_SplitDNSProcessor.h \
-  Inline.cc \
-  P_DNS.h \
-  P_DNSConnection.h \
-  P_DNSProcessor.h \
-  P_SplitDNS.h \
-  P_SplitDNSProcessor.h \
-  SRV.h \
-  SplitDNS.cc
+	DNS.cc \
+	DNSConnection.cc \
+	I_DNS.h \
+	I_DNSProcessor.h \
+	I_SplitDNS.h \
+	I_SplitDNSProcessor.h \
+	Inline.cc \
+	P_DNS.h \
+	P_DNSConnection.h \
+	P_DNSProcessor.h \
+	P_SplitDNS.h \
+	P_SplitDNSProcessor.h \
+	SRV.h \
+	SplitDNS.cc
 
 #test_UNUSED_SOURCES = \
 #  test_I_DNS.cc \
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index 340931b..cc060aa 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -17,94 +17,94 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  $(TS_INCLUDES)
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	$(TS_INCLUDES)
 
 TESTS = $(check_PROGRAMS)
 
 noinst_LIBRARIES = libinkevent.a
 
 libinkevent_a_SOURCES = \
-  EventSystem.cc \
-  IOBuffer.cc \
-  I_Action.h \
-  I_Continuation.h \
-  I_EThread.h \
-  I_Event.h \
-  I_EventProcessor.h \
-  I_EventSystem.h \
-  I_IOBuffer.h \
-  I_Lock.h \
-  I_PriorityEventQueue.h \
-  I_Processor.h \
-  I_ProtectedQueue.h \
-  I_ProxyAllocator.h \
-  I_SocketManager.h \
-  I_Tasks.h \
-  I_Thread.h \
-  I_VConnection.h \
-  I_VIO.h \
-  Inline.cc \
-  Lock.cc \
-  PQ-List.cc \
-  P_EventSystem.h \
-  P_Freer.h \
-  P_IOBuffer.h \
-  P_ProtectedQueue.h \
-  P_Thread.h \
-  P_UnixEThread.h \
-  P_UnixEvent.h \
-  P_UnixEventProcessor.h \
-  P_UnixSocketManager.h \
-  P_VConnection.h \
-  P_VIO.h \
-  Processor.cc \
-  ProtectedQueue.cc \
-  ProxyAllocator.cc \
-  SocketManager.cc \
-  Tasks.cc \
-  Thread.cc \
-  UnixEThread.cc \
-  UnixEvent.cc \
-  UnixEventProcessor.cc
+	EventSystem.cc \
+	IOBuffer.cc \
+	I_Action.h \
+	I_Continuation.h \
+	I_EThread.h \
+	I_Event.h \
+	I_EventProcessor.h \
+	I_EventSystem.h \
+	I_IOBuffer.h \
+	I_Lock.h \
+	I_PriorityEventQueue.h \
+	I_Processor.h \
+	I_ProtectedQueue.h \
+	I_ProxyAllocator.h \
+	I_SocketManager.h \
+	I_Tasks.h \
+	I_Thread.h \
+	I_VConnection.h \
+	I_VIO.h \
+	Inline.cc \
+	Lock.cc \
+	PQ-List.cc \
+	P_EventSystem.h \
+	P_Freer.h \
+	P_IOBuffer.h \
+	P_ProtectedQueue.h \
+	P_Thread.h \
+	P_UnixEThread.h \
+	P_UnixEvent.h \
+	P_UnixEventProcessor.h \
+	P_UnixSocketManager.h \
+	P_VConnection.h \
+	P_VIO.h \
+	Processor.cc \
+	ProtectedQueue.cc \
+	ProxyAllocator.cc \
+	SocketManager.cc \
+	Tasks.cc \
+	Thread.cc \
+	UnixEThread.cc \
+	UnixEvent.cc \
+	UnixEventProcessor.cc
 
 check_PROGRAMS = test_Buffer test_Event \
-  test_MIOBufferWriter
+	test_MIOBufferWriter
 
 test_LD_FLAGS = \
-  @AM_LDFLAGS@ \
-  @OPENSSL_LDFLAGS@
+	@AM_LDFLAGS@ \
+	@OPENSSL_LDFLAGS@
 
 test_CPP_FLAGS = \
-  $(AM_CPPFLAGS) \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/proxy/logging \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  @OPENSSL_INCLUDES@
+	$(AM_CPPFLAGS) \
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/proxy/logging \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	@OPENSSL_INCLUDES@
 
 test_LD_ADD = \
-  libinkevent.a \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
-  @LIBTCL@ @HWLOC_LIBS@
+	libinkevent.a \
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
+	@LIBTCL@ @HWLOC_LIBS@
 
 test_Buffer_SOURCES = \
-  test_Buffer.cc
+	test_Buffer.cc
 
 #test_UNUSED_SOURCES = \
 #  test_I_Buffer.cc \
 #  test_P_Buffer.cc
 
 test_Event_SOURCES = \
-  test_Event.cc
+	test_Event.cc
 
 #test_UNUSED_SOURCES = \
 #  test_I_Event.cc \
@@ -120,10 +120,10 @@ test_Buffer_LDADD = $(test_LD_ADD)
 test_Event_LDADD = $(test_LD_ADD)
 
 test_MIOBufferWriter_CPPFLAGS = $(AM_CPPFLAGS)\
-  -I$(abs_top_srcdir)/tests/include
+	-I$(abs_top_srcdir)/tests/include
 
 test_MIOBufferWriter_SOURCES = \
-  unit-tests/test_MIOBufferWriter.cc
+	unit-tests/test_MIOBufferWriter.cc
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/iocore/hostdb/Makefile.am b/iocore/hostdb/Makefile.am
index 1b40fb8..e4a453a 100644
--- a/iocore/hostdb/Makefile.am
+++ b/iocore/hostdb/Makefile.am
@@ -17,63 +17,63 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	$(TS_INCLUDES)
 
 EXTRA_DIST = I_HostDB.h
 
 noinst_LIBRARIES = libinkhostdb.a
 
 libinkhostdb_a_SOURCES = \
-  HostDB.cc \
-  I_HostDB.h \
-  I_HostDBProcessor.h \
-  Inline.cc \
-  P_HostDB.h \
-  P_HostDBProcessor.h \
-  P_RefCountCache.h \
-  P_RefCountCacheSerializer.h \
-  RefCountCache.cc
+	HostDB.cc \
+	I_HostDB.h \
+	I_HostDBProcessor.h \
+	Inline.cc \
+	P_HostDB.h \
+	P_HostDBProcessor.h \
+	P_RefCountCache.h \
+	P_RefCountCacheSerializer.h \
+	RefCountCache.cc
 
 TESTS = $(check_PROGRAMS)
 check_PROGRAMS = test_RefCountCache
 
 test_RefCountCache_SOURCES = \
-  test_RefCountCache.cc
+	test_RefCountCache.cc
 
 #test_UNUSED_SOURCES = \
 #  test_I_HostDB.cc \
 #  test_P_HostDB.cc
 
 test_LD_FLAGS = \
-  @AM_LDFLAGS@ \
-  @OPENSSL_LDFLAGS@
+	@AM_LDFLAGS@ \
+	@OPENSSL_LDFLAGS@
 
 test_CPP_FLAGS = \
-  $(AM_CPPFLAGS) \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/proxy/logging \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  @OPENSSL_INCLUDES@
+	$(AM_CPPFLAGS) \
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/proxy/logging \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	@OPENSSL_INCLUDES@
 
 test_LD_ADD = \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
-  @LIBTCL@ @HWLOC_LIBS@
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
+	@LIBTCL@ @HWLOC_LIBS@
 
 test_RefCountCache_CPPFLAGS = $(test_CPP_FLAGS)
 
diff --git a/iocore/net/Makefile.am b/iocore/net/Makefile.am
index 7dbbd3b..6ebb1d5 100644
--- a/iocore/net/Makefile.am
+++ b/iocore/net/Makefile.am
@@ -17,18 +17,18 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/shared \
-  -I$(abs_top_srcdir)/proxy/logging \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/proxy/http \
-  $(TS_INCLUDES) \
-  @OPENSSL_INCLUDES@
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/shared \
+	-I$(abs_top_srcdir)/proxy/logging \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/proxy/http \
+	$(TS_INCLUDES) \
+	@OPENSSL_INCLUDES@
 
 TESTS = $(check_PROGRAMS)
 
@@ -36,135 +36,135 @@ check_PROGRAMS = test_certlookup test_UDPNet
 noinst_LIBRARIES = libinknet.a
 
 test_certlookup_LDFLAGS = \
-  @AM_LDFLAGS@ \
-  @OPENSSL_LDFLAGS@
+	@AM_LDFLAGS@ \
+	@OPENSSL_LDFLAGS@
 
 test_certlookup_SOURCES = \
-  test_certlookup.cc \
-  SSLCertLookup.cc
+	test_certlookup.cc \
+	SSLCertLookup.cc
 
 test_certlookup_LDADD = \
-  @OPENSSL_LIBS@ \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/proxy/ParentSelectionStrategy.o
+	@OPENSSL_LIBS@ \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/proxy/ParentSelectionStrategy.o
 
 test_UDPNet_CPPFLAGS = \
-  $(AM_CPPFLAGS) \
-  $(LUAJIT_CPPFLAGS) \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/proxy/logging \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  @OPENSSL_INCLUDES@
+	$(AM_CPPFLAGS) \
+	$(LUAJIT_CPPFLAGS) \
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/proxy/logging \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	@OPENSSL_INCLUDES@
 
 test_UDPNet_LDFLAGS = \
-  @AM_LDFLAGS@ \
-  @OPENSSL_LDFLAGS@
+	@AM_LDFLAGS@ \
+	@OPENSSL_LDFLAGS@
 
 test_UDPNet_LDADD = \
-  libinknet.a \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/proxy/ParentSelectionStrategy.o \
-  $(top_builddir)/lib/tsconfig/libtsconfig.la \
-  $(top_builddir)/lib/luajit/src/libluajit.a \
-  @LIBTCL@ @HWLOC_LIBS@ @OPENSSL_LIBS@
+	libinknet.a \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/proxy/ParentSelectionStrategy.o \
+	$(top_builddir)/lib/tsconfig/libtsconfig.la \
+	$(top_builddir)/lib/luajit/src/libluajit.a \
+	@LIBTCL@ @HWLOC_LIBS@ @OPENSSL_LIBS@
 
 test_UDPNet_SOURCES = \
-  test_I_UDPNet.cc
+	test_I_UDPNet.cc
 
 libinknet_a_SOURCES = \
-  BIO_fastopen.cc \
-  BIO_fastopen.h \
-  Connection.cc \
-  I_Net.h \
-  I_NetProcessor.h \
-  I_NetVConnection.h \
-  I_Socks.h \
-  I_UDPConnection.h \
-  I_UDPNet.h \
-  I_UDPPacket.h \
-  Inline.cc \
-  I_SessionAccept.h \
-  SessionAccept.cc \
-  LuaSNIConfig.h \
-  LuaSNIConfig.cc \
-  Net.cc \
-  NetVConnection.cc \
-  P_SNIActionPerformer.h \
-  P_CompletionUtil.h \
-  P_Connection.h \
-  P_InkBulkIO.h \
-  P_LibBulkIO.h \
-  P_Net.h \
-  P_NetAccept.h \
-  P_NetVConnection.h \
-  P_Socks.h \
-  P_SSLCertLookup.h \
-  P_SSLConfig.h \
-  P_SSLNetAccept.h \
-  P_SSLNetProcessor.h \
-  P_SSLNetVConnection.h \
-  P_SSLNextProtocolAccept.h \
-  P_SSLNextProtocolSet.h \
-  P_SSLSNI.h \
-  P_SSLUtils.h \
-  P_SSLClientUtils.h \
-  P_OCSPStapling.h \
-  P_Socks.h \
-  P_UDPConnection.h \
-  P_UDPIOEvent.h \
-  P_UDPNet.h \
-  P_UDPPacket.h \
-  P_UnixCompletionUtil.h \
-  P_UnixNet.h \
-  P_UnixNetProcessor.h \
-  P_UnixNetState.h \
-  P_UnixNetVConnection.h \
-  P_UnixPollDescriptor.h \
-  P_UnixUDPConnection.h \
-  Socks.cc \
-  SNIActionPerformer.cc \
-  SSLCertLookup.cc \
-  SSLSessionCache.cc \
-  SSLConfig.cc \
-  SSLInternal.cc \
-  SSLNetAccept.cc \
-  SSLNetProcessor.cc \
-  SSLNetVConnection.cc \
-  SSLNextProtocolAccept.cc \
-  SSLNextProtocolSet.cc \
-  SSLSNIConfig.cc \
-  SSLUtils.cc \
-  SSLClientUtils.cc \
-  OCSPStapling.cc \
-  Socks.cc \
-  UDPIOEvent.cc \
-  UnixConnection.cc \
-  UnixNet.cc \
-  UnixNetAccept.cc \
-  UnixNetPages.cc \
-  UnixNetProcessor.cc \
-  UnixNetVConnection.cc \
-  UnixUDPConnection.cc \
-  UnixUDPNet.cc \
-  SSLDynlock.cc
+	BIO_fastopen.cc \
+	BIO_fastopen.h \
+	Connection.cc \
+	I_Net.h \
+	I_NetProcessor.h \
+	I_NetVConnection.h \
+	I_Socks.h \
+	I_UDPConnection.h \
+	I_UDPNet.h \
+	I_UDPPacket.h \
+	Inline.cc \
+	I_SessionAccept.h \
+	SessionAccept.cc \
+	LuaSNIConfig.h \
+	LuaSNIConfig.cc \
+	Net.cc \
+	NetVConnection.cc \
+	P_SNIActionPerformer.h \
+	P_CompletionUtil.h \
+	P_Connection.h \
+	P_InkBulkIO.h \
+	P_LibBulkIO.h \
+	P_Net.h \
+	P_NetAccept.h \
+	P_NetVConnection.h \
+	P_Socks.h \
+	P_SSLCertLookup.h \
+	P_SSLConfig.h \
+	P_SSLNetAccept.h \
+	P_SSLNetProcessor.h \
+	P_SSLNetVConnection.h \
+	P_SSLNextProtocolAccept.h \
+	P_SSLNextProtocolSet.h \
+	P_SSLSNI.h \
+	P_SSLUtils.h \
+	P_SSLClientUtils.h \
+	P_OCSPStapling.h \
+	P_Socks.h \
+	P_UDPConnection.h \
+	P_UDPIOEvent.h \
+	P_UDPNet.h \
+	P_UDPPacket.h \
+	P_UnixCompletionUtil.h \
+	P_UnixNet.h \
+	P_UnixNetProcessor.h \
+	P_UnixNetState.h \
+	P_UnixNetVConnection.h \
+	P_UnixPollDescriptor.h \
+	P_UnixUDPConnection.h \
+	Socks.cc \
+	SNIActionPerformer.cc \
+	SSLCertLookup.cc \
+	SSLSessionCache.cc \
+	SSLConfig.cc \
+	SSLInternal.cc \
+	SSLNetAccept.cc \
+	SSLNetProcessor.cc \
+	SSLNetVConnection.cc \
+	SSLNextProtocolAccept.cc \
+	SSLNextProtocolSet.cc \
+	SSLSNIConfig.cc \
+	SSLUtils.cc \
+	SSLClientUtils.cc \
+	OCSPStapling.cc \
+	Socks.cc \
+	UDPIOEvent.cc \
+	UnixConnection.cc \
+	UnixNet.cc \
+	UnixNetAccept.cc \
+	UnixNetPages.cc \
+	UnixNetProcessor.cc \
+	UnixNetVConnection.cc \
+	UnixUDPConnection.cc \
+	UnixUDPNet.cc \
+	SSLDynlock.cc
 
 if BUILD_TESTS
-  libinknet_a_SOURCES += \
-     NetVCTest.cc \
-     P_NetVCTest.h
+libinknet_a_SOURCES += \
+	NetVCTest.cc \
+	P_NetVCTest.h
 endif
 
 libinknet_a_LIBADD = \
-   $(top_builddir)/lib/luajit/src/libluajit.a \
-   $(top_builddir)/lib/tsconfig/libtsconfig.la
+	$(top_builddir)/lib/luajit/src/libluajit.a \
+	$(top_builddir)/lib/tsconfig/libtsconfig.la
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/iocore/utils/Makefile.am b/iocore/utils/Makefile.am
index 2ddd748..b13816d 100644
--- a/iocore/utils/Makefile.am
+++ b/iocore/utils/Makefile.am
@@ -17,20 +17,20 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/iocore/eventsystem \
-  $(TS_INCLUDES)
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/iocore/eventsystem \
+	$(TS_INCLUDES)
 
 noinst_LIBRARIES = libinkutils.a
 
 libinkutils_a_SOURCES = \
-  I_Machine.h \
-  I_OneWayMultiTunnel.h \
-  I_OneWayTunnel.h \
-  Machine.cc \
-  OneWayMultiTunnel.cc \
-  OneWayTunnel.cc
+	I_Machine.h \
+	I_OneWayMultiTunnel.h \
+	I_OneWayTunnel.h \
+	Machine.cc \
+	OneWayMultiTunnel.cc \
+	OneWayTunnel.cc
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/lib/bindings/Makefile.am b/lib/bindings/Makefile.am
index 96683f8..5971329 100644
--- a/lib/bindings/Makefile.am
+++ b/lib/bindings/Makefile.am
@@ -19,22 +19,22 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
-  $(LUAJIT_CPPFLAGS) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  $(TS_INCLUDES)
+	$(LUAJIT_CPPFLAGS) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	$(TS_INCLUDES)
 
 noinst_LTLIBRARIES = libbindings.la
 
 libbindings_la_SOURCES = \
-  bindings.cc \
-  bindings.h \
-  lua.cc \
-  lua.h \
-  metrics.cc \
-  metrics.h \
-  repl.cc \
-  repl.h
+	bindings.cc \
+	bindings.h \
+	lua.cc \
+	lua.h \
+	metrics.cc \
+	metrics.h \
+	repl.cc \
+	repl.h
 
 clang-tidy-local: $(DIST_SOURCES)
 	$(CXX_Clang_Tidy)
diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am
index c27c884..134c48d 100644
--- a/lib/records/Makefile.am
+++ b/lib/records/Makefile.am
@@ -19,57 +19,57 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
-  -I$(abs_top_srcdir)/iocore/eventsystem \
-  -I$(abs_top_srcdir)/iocore/utils \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/lib \
-  $(TS_INCLUDES)
+	-I$(abs_top_srcdir)/iocore/eventsystem \
+	-I$(abs_top_srcdir)/iocore/utils \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/lib \
+	$(TS_INCLUDES)
 
 noinst_LIBRARIES = librecords_lm.a librecords_p.a librecords_cop.a
 
 librecords_COMMON = \
-  I_RecAlarms.h \
-  I_RecCore.h \
-  I_RecDefs.h \
-  I_RecEvents.h \
-  I_RecHttp.h \
-  I_RecMutex.h \
-  I_RecSignals.h \
-  P_RecCore.cc \
-  P_RecCore.h \
-  P_RecDefs.h \
-  P_RecFile.h \
-  P_RecFile.h \
-  P_RecMessage.h \
-  P_RecUtils.h \
-  RecConfigParse.cc \
-  RecCore.cc \
-  RecDebug.cc \
-  RecFile.cc \
-  RecHttp.cc \
-  RecMessage.cc \
-  RecMutex.cc \
-  RecRawStats.cc \
-  RecUtils.cc
+	I_RecAlarms.h \
+	I_RecCore.h \
+	I_RecDefs.h \
+	I_RecEvents.h \
+	I_RecHttp.h \
+	I_RecMutex.h \
+	I_RecSignals.h \
+	P_RecCore.cc \
+	P_RecCore.h \
+	P_RecDefs.h \
+	P_RecFile.h \
+	P_RecFile.h \
+	P_RecMessage.h \
+	P_RecUtils.h \
+	RecConfigParse.cc \
+	RecCore.cc \
+	RecDebug.cc \
+	RecFile.cc \
+	RecHttp.cc \
+	RecMessage.cc \
+	RecMutex.cc \
+	RecRawStats.cc \
+	RecUtils.cc
 
 librecords_lm_a_SOURCES = \
-  $(librecords_COMMON) \
-  I_RecLocal.h \
-  P_RecLocal.h \
-  RecLocal.cc
+	$(librecords_COMMON) \
+	I_RecLocal.h \
+	P_RecLocal.h \
+	RecLocal.cc
 
 librecords_p_a_SOURCES = \
-  $(librecords_COMMON) \
-  I_RecProcess.h \
-  P_RecProcess.h \
-  RecProcess.cc
+	$(librecords_COMMON) \
+	I_RecProcess.h \
+	P_RecProcess.h \
+	RecProcess.cc
 
 librecords_cop_a_SOURCES = \
-  RecConfigParse.cc \
-  RecFile.cc \
-  RecDebug.cc
+	RecConfigParse.cc \
+	RecFile.cc \
+	RecDebug.cc
 
 clang-tidy-local: $(sort $(DIST_SOURCES))
 	$(CXX_Clang_Tidy)
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index 1acd80f..b0d7ea7 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -32,185 +32,185 @@ TESTS = $(check_PROGRAMS)
 lib_LTLIBRARIES = libtsutil.la
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	$(TS_INCLUDES)
 
 libtsutil_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@
 libtsutil_la_LIBADD = \
-  @HWLOC_LIBS@ \
-  @LIBOBJS@ \
-  @LIBPCRE@ \
-  @OPENSSL_LIBS@ \
-  @LIBTCL@ \
-  @LIBRESOLV@ \
-  @LIBCAP@ \
-  -lc
+	@HWLOC_LIBS@ \
+	@LIBOBJS@ \
+	@LIBPCRE@ \
+	@OPENSSL_LIBS@ \
+	@LIBTCL@ \
+	@LIBRESOLV@ \
+	@LIBCAP@ \
+	-lc
 
 libtsutil_la_SOURCES = \
-  Allocator.h \
-  Arena.cc \
-  Arena.h \
-  BaseLogFile.cc \
-  BaseLogFile.h \
-  Bitops.cc \
-  Bitops.h \
-  BufferWriter.h \
-  BufferWriterForward.h \
-  BufferWriterFormat.cc \
-  ConsistentHash.cc \
-  ConsistentHash.h \
-  ContFlags.cc \
-  ContFlags.h \
-  CryptoHash.cc \
-  CryptoHash.h \
-  defalloc.h \
-  Diags.cc \
-  Diags.h \
-  DynArray.h \
-  EventNotify.cc \
-  EventNotify.h \
-  fastlz.c \
-  fastlz.h \
-  Hash.cc \
-  HashFNV.cc \
-  HashFNV.h \
-  Hash.h \
-  HashMD5.cc \
-  HashMD5.h \
-  HashSip.cc \
-  HashSip.h \
-  History.h \
-  HostLookup.cc \
-  HostLookup.h \
-  hugepages.cc \
-  hugepages.h \
-  I_Layout.h \
-  ink_aiocb.h \
-  ink_align.h \
-  ink_apidefs.h \
-  ink_args.cc \
-  ink_args.h \
-  ink_assert.cc \
-  ink_assert.h \
-  ink_atomic.h \
-  ink_base64.cc \
-  ink_base64.h \
-  ink_cap.cc \
-  ink_cap.h \
-  ink_code.cc \
-  ink_code.h \
-  ink_defs.cc \
-  ink_defs.h \
-  InkErrno.cc \
-  InkErrno.h \
-  ink_error.cc \
-  ink_error.h \
-  ink_exception.h \
-  ink_file.cc \
-  ink_file.h \
-  ink_hash_table.cc \
-  ink_hash_table.h \
-  ink_hrtime.cc \
-  ink_hrtime.h \
-  ink_inet.cc \
-  ink_inet.h \
-  ink_inout.h \
-  ink_llqueue.h \
-  ink_lockfile.h \
-  INK_MD5.h \
-  ink_memory.cc \
-  ink_memory.h \
-  ink_mutex.cc \
-  ink_mutex.h \
-  ink_platform.h \
-  ink_queue.cc \
-  ink_queue.h \
-  ink_queue_utils.cc \
-  ink_rand.cc \
-  ink_rand.h \
-  ink_res_init.cc \
-  ink_res_mkquery.cc \
-  ink_resolver.h \
-  ink_resource.cc \
-  ink_resource.h \
-  ink_rwlock.cc \
-  ink_rwlock.h \
-  ink_sock.cc \
-  ink_sock.h \
-  ink_sprintf.cc \
-  ink_sprintf.h \
+	Allocator.h \
+	Arena.cc \
+	Arena.h \
+	BaseLogFile.cc \
+	BaseLogFile.h \
+	Bitops.cc \
+	Bitops.h \
+	BufferWriter.h \
+	BufferWriterForward.h \
+	BufferWriterFormat.cc \
+	ConsistentHash.cc \
+	ConsistentHash.h \
+	ContFlags.cc \
+	ContFlags.h \
+	CryptoHash.cc \
+	CryptoHash.h \
+	defalloc.h \
+	Diags.cc \
+	Diags.h \
+	DynArray.h \
+	EventNotify.cc \
+	EventNotify.h \
+	fastlz.c \
+	fastlz.h \
+	Hash.cc \
+	HashFNV.cc \
+	HashFNV.h \
+	Hash.h \
+	HashMD5.cc \
+	HashMD5.h \
+	HashSip.cc \
+	HashSip.h \
+	History.h \
+	HostLookup.cc \
+	HostLookup.h \
+	hugepages.cc \
+	hugepages.h \
+	I_Layout.h \
+	ink_aiocb.h \
+	ink_align.h \
+	ink_apidefs.h \
+	ink_args.cc \
+	ink_args.h \
+	ink_assert.cc \
+	ink_assert.h \
+	ink_atomic.h \
+	ink_base64.cc \
+	ink_base64.h \
+	ink_cap.cc \
+	ink_cap.h \
+	ink_code.cc \
+	ink_code.h \
+	ink_defs.cc \
+	ink_defs.h \
+	InkErrno.cc \
+	InkErrno.h \
+	ink_error.cc \
+	ink_error.h \
+	ink_exception.h \
+	ink_file.cc \
+	ink_file.h \
+	ink_hash_table.cc \
+	ink_hash_table.h \
+	ink_hrtime.cc \
+	ink_hrtime.h \
+	ink_inet.cc \
+	ink_inet.h \
+	ink_inout.h \
+	ink_llqueue.h \
+	ink_lockfile.h \
+	INK_MD5.h \
+	ink_memory.cc \
+	ink_memory.h \
+	ink_mutex.cc \
+	ink_mutex.h \
+	ink_platform.h \
+	ink_queue.cc \
+	ink_queue.h \
+	ink_queue_utils.cc \
+	ink_rand.cc \
+	ink_rand.h \
+	ink_res_init.cc \
+	ink_res_mkquery.cc \
+	ink_resolver.h \
+	ink_resource.cc \
+	ink_resource.h \
+	ink_rwlock.cc \
+	ink_rwlock.h \
+	ink_sock.cc \
+	ink_sock.h \
+	ink_sprintf.cc \
+	ink_sprintf.h \
 	ink_std_compat.h \
-  ink_stack_trace.cc \
-  ink_stack_trace.h \
-  ink_string.cc \
-  ink_string++.cc \
-  ink_string.h \
-  ink_string++.h \
-  ink_sys_control.cc \
-  ink_sys_control.h \
-  ink_syslog.cc \
-  ink_syslog.h \
-  ink_thread.cc \
-  ink_thread.h \
-  ink_time.cc \
-  ink_time.h \
-  ink_uuid.cc \
-  ink_uuid.h \
-  IntrusiveDList.h \
-  IpMap.cc \
-  IpMapConf.cc \
-  IpMapConf.h \
-  IpMap.h \
-  I_Version.h \
-  JeAllocator.h \
-  JeAllocator.cc \
-  Layout.cc \
-  List.h \
-  llqueue.cc \
-  lockfile.cc \
-  Map.h \
-  MatcherUtils.cc \
-  MatcherUtils.h \
-  MemSpan.h \
-  MemArena.cc \
-  MemArena.h \
-  MMH.cc \
-  MMH.h \
-  MT_hashtable.h \
-  ParseRules.cc \
-  ParseRules.h \
-  PriorityQueue.h \
-  Ptr.h \
-  RawHashTable.cc \
-  RawHashTable.h \
-  RbTree.cc \
-  RbTree.h \
-  Regex.cc \
-  Regex.h \
-  Regression.cc \
-  Regression.h \
-  Result.h \
-  runroot.cc \
-  runroot.h \
-  signals.cc \
-  signals.h \
-  SimpleTokenizer.h \
-  SourceLocation.cc \
-  SourceLocation.h \
-  string_view.h \
-  TestBox.h \
-  TextBuffer.cc \
-  TextBuffer.h \
-  TextView.h TextView.cc \
-  Tokenizer.cc \
-  Tokenizer.h \
-  Trie.h \
-  TsBuffer.h \
-  Version.cc \
-  X509HostnameValidator.cc \
-  X509HostnameValidator.h
+	ink_stack_trace.cc \
+	ink_stack_trace.h \
+	ink_string.cc \
+	ink_string++.cc \
+	ink_string.h \
+	ink_string++.h \
+	ink_sys_control.cc \
+	ink_sys_control.h \
+	ink_syslog.cc \
+	ink_syslog.h \
+	ink_thread.cc \
+	ink_thread.h \
+	ink_time.cc \
+	ink_time.h \
+	ink_uuid.cc \
+	ink_uuid.h \
+	IntrusiveDList.h \
+	IpMap.cc \
+	IpMapConf.cc \
+	IpMapConf.h \
+	IpMap.h \
+	I_Version.h \
+	JeAllocator.h \
+	JeAllocator.cc \
+	Layout.cc \
+	List.h \
+	llqueue.cc \
+	lockfile.cc \
+	Map.h \
+	MatcherUtils.cc \
+	MatcherUtils.h \
+	MemSpan.h \
+	MemArena.cc \
+	MemArena.h \
+	MMH.cc \
+	MMH.h \
+	MT_hashtable.h \
+	ParseRules.cc \
+	ParseRules.h \
+	PriorityQueue.h \
+	Ptr.h \
+	RawHashTable.cc \
+	RawHashTable.h \
+	RbTree.cc \
+	RbTree.h \
+	Regex.cc \
+	Regex.h \
+	Regression.cc \
+	Regression.h \
+	Result.h \
+	runroot.cc \
+	runroot.h \
+	signals.cc \
+	signals.h \
+	SimpleTokenizer.h \
+	SourceLocation.cc \
+	SourceLocation.h \
+	string_view.h \
+	TestBox.h \
+	TextBuffer.cc \
+	TextBuffer.h \
+	TextView.h TextView.cc \
+	Tokenizer.cc \
+	Tokenizer.h \
+	Trie.h \
+	TsBuffer.h \
+	Version.cc \
+	X509HostnameValidator.cc \
+	X509HostnameValidator.h
 
 #test_UNUSED_SOURCES = \
 #  load_http_hdr.cc \
@@ -269,8 +269,8 @@ test_tslib_SOURCES = \
 	unit-tests/test_ink_inet.cc \
 	unit-tests/test_IpMap.cc \
 	unit-tests/test_layout.cc \
-       unit-tests/test_MemSpan.cc \
-       unit-tests/test_MemArena.cc \
+	unit-tests/test_MemSpan.cc \
+	unit-tests/test_MemArena.cc \
 	unit-tests/test_MT_hashtable.cc \
 	unit-tests/test_Scalar.cc \
 	unit-tests/test_string_view.cc \
diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am
index 19333e7..db9f963 100644
--- a/lib/tsconfig/Makefile.am
+++ b/lib/tsconfig/Makefile.am
@@ -24,37 +24,37 @@ AM_CFLAGS += @FLEX_CFLAGS@
 AM_YFLAGS = --yacc -d -p tsconfig
 
 AM_CPPFLAGS += \
-  -I$(abs_top_srcdir)/lib \
-  $(TS_INCLUDES)
+	-I$(abs_top_srcdir)/lib \
+	$(TS_INCLUDES)
 
 BUILT_SOURCES = \
-  TsConfigGrammar.hpp
+	TsConfigGrammar.hpp
 
 CLEANFILES = $(BUILT_SOURCES)
 
 libtsconfig_la_SOURCES = \
-  Errata.cc \
-  Errata.h \
-  IntrusivePtr.h \
-  NumericType.h \
-  TsBuilder.cc \
-  TsBuilder.h \
-  TsConfigGrammar.hpp \
-  TsConfigLexer.h \
-  TsConfigLua.cc \
-  TsConfigLua.h \
-  TsConfigParseEvents.h \
-  TsConfigTypes.h \
-  TsErrataUtil.cc \
-  TsErrataUtil.h \
-  TsValue.cc \
-  TsValue.h
+	Errata.cc \
+	Errata.h \
+	IntrusivePtr.h \
+	NumericType.h \
+	TsBuilder.cc \
+	TsBuilder.h \
+	TsConfigGrammar.hpp \
+	TsConfigLexer.h \
+	TsConfigLua.cc \
+	TsConfigLua.h \
+	TsConfigParseEvents.h \
+	TsConfigTypes.h \
+	TsErrataUtil.cc \
+	TsErrataUtil.h \
+	TsValue.cc \
+	TsValue.h
 
 # Depend on the original grammar files only if we can build them.
 if BUILD_TSCONFIG_GRAMMAR
-  libtsconfig_la_SOURCES += TsConfigGrammar.y TsConfigSyntax.l
+libtsconfig_la_SOURCES += TsConfigGrammar.y TsConfigSyntax.l
 else
-  libtsconfig_la_SOURCES += TsConfigGrammar.c TsConfigGrammar.h TsConfigSyntax.c
+libtsconfig_la_SOURCES += TsConfigGrammar.c TsConfigGrammar.h TsConfigSyntax.c
 
 # Prevent automatic rules from firing if invalid.
 TsConfigSyntax.c: ;
diff --git a/lib/wccp/Makefile.am b/lib/wccp/Makefile.am
index 5401e01..6aff885 100644
--- a/lib/wccp/Makefile.am
+++ b/lib/wccp/Makefile.am
@@ -20,9 +20,9 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/proxy \
-  $(TS_INCLUDES)
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/proxy \
+	$(TS_INCLUDES)
 
 #WCCP_DEFS = @WCCP_DEFS@
 #DEFS += $(WCCP_DEFS)
@@ -31,17 +31,17 @@ noinst_LIBRARIES = libwccp.a
 # noinst_PROGRAMS = test-cache
 
 libwccp_a_SOURCES = \
-  Wccp.h \
-  WccpConfig.cc \
-  WccpEndPoint.cc \
-  WccpLocal.h \
-  WccpMeta.h \
-  WccpMsg.cc \
-  WccpStatic.cc \
-  WccpUtil.h
+	Wccp.h \
+	WccpConfig.cc \
+	WccpEndPoint.cc \
+	WccpLocal.h \
+	WccpMeta.h \
+	WccpMsg.cc \
+	WccpStatic.cc \
+	WccpUtil.h
 
 # test_cache_SOURCES = \
-#   wccp-test-cache.cc
+#		wccp-test-cache.cc
 
 # test_cache_LDADD = $(LDADD) -L$(top_builddir)/lib/tsconfig -ltsconfig -L$(top_builddir)/lib/wccp -lwccp -L$(top_builddir)/lib/ts -ltsutil
 
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index ec31b28..4074be9 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -26,53 +26,53 @@ SUBDIRS = utils api
 noinst_LTLIBRARIES = libmgmt_c.la libmgmt_p.la libmgmt_lm.la
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/lib \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/lib \
+	$(TS_INCLUDES)
 
 libmgmt_c_la_SOURCES = \
-  RecordsConfig.cc \
-  RecordsConfig.h
+	RecordsConfig.cc \
+	RecordsConfig.h
 
 libmgmt_COMMON = \
-  BaseManager.cc \
-  BaseManager.h \
-  MgmtDefs.h \
-  RecordsConfigUtils.cc
+	BaseManager.cc \
+	BaseManager.h \
+	MgmtDefs.h \
+	RecordsConfigUtils.cc
 
 libmgmt_p_la_SOURCES = \
-  $(libmgmt_COMMON) \
-  ProcessManager.cc \
-  ProcessManager.h \
-  ProxyConfig.cc \
-  ProxyConfig.h
+	$(libmgmt_COMMON) \
+	ProcessManager.cc \
+	ProcessManager.h \
+	ProxyConfig.cc \
+	ProxyConfig.h
 
 libmgmt_lm_la_SOURCES = \
-  $(libmgmt_COMMON) \
-  Alarms.cc \
-  Alarms.h \
-  FileManager.cc \
-  FileManager.h \
-  LocalManager.cc \
-  LocalManager.h \
-  Rollback.cc \
-  Rollback.h \
-  WebMgmtUtils.cc \
-  WebMgmtUtils.h
+	$(libmgmt_COMMON) \
+	Alarms.cc \
+	Alarms.h \
+	FileManager.cc \
+	FileManager.h \
+	LocalManager.cc \
+	LocalManager.h \
+	Rollback.cc \
+	Rollback.h \
+	WebMgmtUtils.cc \
+	WebMgmtUtils.h
 
 libmgmt_lm_la_LIBADD = \
-  libmgmt_c.la \
-  $(top_builddir)/mgmt/utils/libutils_lm.la
+	libmgmt_c.la \
+	$(top_builddir)/mgmt/utils/libutils_lm.la
 
 libmgmt_p_la_LIBADD = \
-  libmgmt_c.la \
-  $(top_builddir)/mgmt/utils/libutils_p.la
+	libmgmt_c.la \
+	$(top_builddir)/mgmt/utils/libutils_p.la
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/mgmt/api/Makefile.am b/mgmt/api/Makefile.am
index d5db617..c60cdd4 100644
--- a/mgmt/api/Makefile.am
+++ b/mgmt/api/Makefile.am
@@ -22,67 +22,67 @@ include $(top_srcdir)/build/tidy.mk
 SUBDIRS = include
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  -I$(abs_top_srcdir)/lib \
-  $(TS_INCLUDES) \
-  $(LIBUNWIND_CFLAGS)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	-I$(abs_top_srcdir)/lib \
+	$(TS_INCLUDES) \
+	$(LIBUNWIND_CFLAGS)
 
 noinst_LTLIBRARIES = libmgmtapilocal.la libmgmtapi.la
 lib_LTLIBRARIES = libtsmgmt.la
 
 libmgmtapi_la_SOURCES = \
-  CoreAPI.h \
-  CoreAPIShared.cc \
-  CoreAPIShared.h \
-  EventCallback.cc \
-  EventCallback.h \
-  GenericParser.cc \
-  GenericParser.h \
-  INKMgmtAPI.cc \
-  NetworkMessage.cc \
-  NetworkMessage.h \
-  include/mgmtapi.h
+	CoreAPI.h \
+	CoreAPIShared.cc \
+	CoreAPIShared.h \
+	EventCallback.cc \
+	EventCallback.h \
+	GenericParser.cc \
+	GenericParser.h \
+	INKMgmtAPI.cc \
+	NetworkMessage.cc \
+	NetworkMessage.h \
+	include/mgmtapi.h
 
 if BUILD_TESTS
-  noinst_PROGRAMS = traffic_api_cli_remote
+noinst_PROGRAMS = traffic_api_cli_remote
 endif
 
 libmgmtapilocal_la_SOURCES = \
-  CoreAPI.cc \
-  EventControlMain.cc \
-  EventControlMain.h \
-  NetworkUtilsLocal.cc \
-  NetworkUtilsLocal.h \
-  TSControlMain.cc \
-  TSControlMain.h
+	CoreAPI.cc \
+	EventControlMain.cc \
+	EventControlMain.h \
+	NetworkUtilsLocal.cc \
+	NetworkUtilsLocal.h \
+	TSControlMain.cc \
+	TSControlMain.h
 
 libtsmgmt_la_SOURCES = \
-  CoreAPIRemote.cc \
-  NetworkUtilsRemote.cc \
-  NetworkUtilsRemote.h
+	CoreAPIRemote.cc \
+	NetworkUtilsRemote.cc \
+	NetworkUtilsRemote.h
 
 libmgmtapilocal_la_LIBADD = \
-  libmgmtapi.la \
-  $(top_builddir)/lib/ts/libtsutil.la
+	libmgmtapi.la \
+	$(top_builddir)/lib/ts/libtsutil.la
 
 libtsmgmt_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@
 libtsmgmt_la_LIBADD = @LIBOBJS@ \
-  libmgmtapi.la \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/mgmt/utils/libutils_p.la
+	libmgmtapi.la \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/mgmt/utils/libutils_p.la
 
 if BUILD_TESTS
-  traffic_api_cli_remote_SOURCES = APITestCliRemote.cc
+traffic_api_cli_remote_SOURCES = APITestCliRemote.cc
 endif
 
 traffic_api_cli_remote_LDADD = \
-  libtsmgmt.la \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTCL@ @OPENSSL_LIBS@
+	libtsmgmt.la \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	@LIBTCL@ @OPENSSL_LIBS@
 
 clang-tidy-local: $(DIST_SOURCES)
 	$(CXX_Clang_Tidy)
diff --git a/mgmt/api/include/Makefile.am b/mgmt/api/include/Makefile.am
index 31762e4..f57bc55 100644
--- a/mgmt/api/include/Makefile.am
+++ b/mgmt/api/include/Makefile.am
@@ -19,4 +19,4 @@
 library_includedir=$(includedir)/ts
 
 library_include_HEADERS = \
-  mgmtapi.h
+	mgmtapi.h
diff --git a/mgmt/utils/Makefile.am b/mgmt/utils/Makefile.am
index 73a5306..b8ed716 100644
--- a/mgmt/utils/Makefile.am
+++ b/mgmt/utils/Makefile.am
@@ -18,16 +18,16 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  -I$(abs_top_srcdir)/iocore/utils \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/api \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  -I$(abs_top_srcdir)/lib/tsconfig \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/lib \
-  $(TS_INCLUDES) \
-  @OPENSSL_INCLUDES@
+	-I$(abs_top_srcdir)/iocore/utils \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/api \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	-I$(abs_top_srcdir)/lib/tsconfig \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/lib \
+	$(TS_INCLUDES) \
+	@OPENSSL_INCLUDES@
 
 # header files used by other libraries
 EXTRA_DIST = MgmtHashTable.h MgmtSocket.h
@@ -38,31 +38,31 @@ check_PROGRAMS = test_marshall
 TESTS = $(check_PROGRAMS)
 
 libutils_COMMON = \
-  MgmtMarshall.cc \
-  MgmtMarshall.h \
-  MgmtSocket.cc \
-  MgmtSocket.h \
-  MgmtUtils.cc \
-  MgmtUtils.h
+	MgmtMarshall.cc \
+	MgmtMarshall.h \
+	MgmtSocket.cc \
+	MgmtSocket.h \
+	MgmtUtils.cc \
+	MgmtUtils.h
 
 libutils_lm_la_SOURCES = \
-  $(libutils_COMMON) \
-  ExpandingArray.cc \
-  ExpandingArray.h \
-  MgmtLocalCleanup.cc
+	$(libutils_COMMON) \
+	ExpandingArray.cc \
+	ExpandingArray.h \
+	MgmtLocalCleanup.cc
 
 libutils_p_la_SOURCES = \
-  $(libutils_COMMON) \
-  MgmtProcessCleanup.cc
+	$(libutils_COMMON) \
+	MgmtProcessCleanup.cc
 
 test_marshall_LDFLAGS = \
-  @AM_LDFLAGS@ \
-  @OPENSSL_LDFLAGS@
+	@AM_LDFLAGS@ \
+	@OPENSSL_LDFLAGS@
 
 test_marshall_SOURCES = test_marshall.cc
 test_marshall_LDADD = \
-  libutils_p.la \
-  $(top_builddir)/lib/ts/libtsutil.la
+	libutils_p.la \
+	$(top_builddir)/lib/ts/libtsutil.la
 
 include $(top_srcdir)/build/tidy.mk
 
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 3696f92..0a9536c 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -22,37 +22,37 @@ include $(top_srcdir)/build/tidy.mk
 SUBDIRS = http http2 logging config
 noinst_LIBRARIES =
 bin_PROGRAMS = \
-  traffic_server \
-  traffic_logcat \
-  traffic_logstats
+	traffic_server \
+	traffic_logcat \
+	traffic_logstats
 
 TESTS = \
-  tests/test_logstats_json \
-  tests/test_logstats_summary
+	tests/test_logstats_json \
+	tests/test_logstats_summary
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_srcdir)/http \
-  -I$(abs_srcdir)/http2 \
-  -I$(abs_srcdir)/logging \
-  -I$(abs_srcdir)/http/remap  \
-  -I$(abs_srcdir)/hdrs \
-  -I$(abs_srcdir)/shared \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/lib \
-  $(TS_INCLUDES) \
-  @OPENSSL_INCLUDES@
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_srcdir)/http \
+	-I$(abs_srcdir)/http2 \
+	-I$(abs_srcdir)/logging \
+	-I$(abs_srcdir)/http/remap \
+	-I$(abs_srcdir)/hdrs \
+	-I$(abs_srcdir)/shared \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/lib \
+	$(TS_INCLUDES) \
+	@OPENSSL_INCLUDES@
 
 # NOTE: it is safe to use AM_LDFLAGS here because we are only building executables. If we start
 # building libtool archives, change these to only apply to the executables.
 AM_LDFLAGS += \
-  $(LUAJIT_LDFLAGS) \
-  @OPENSSL_LDFLAGS@
+	$(LUAJIT_LDFLAGS) \
+	@OPENSSL_LDFLAGS@
 
 noinst_HEADERS = \
-  Show.h
+	Show.h
 
 # These are currently built separate, as part of building the lib/ tree, using
 # the normal LuaJIT build system. We are using the .o's directly, instead of the
@@ -60,164 +60,164 @@ noinst_HEADERS = \
 # switch to using the luajit.so, but that involves making sure it installs safely
 # and cleanly.
 LUAJIT = \
-  lib_aux.o \
-  lib_base.o \
-  lib_bit.o \
-  lib_debug.o \
-  lib_ffi.o \
-  lib_init.o \
-  lib_io.o \
-  lib_jit.o \
-  lib_math.o \
-  lib_os.o \
-  lib_package.o \
-  lib_string.o \
-  lib_table.o \
-  lj_alloc.o \
-  lj_api.o \
-  lj_asm.o \
-  lj_bc.o \
-  lj_bcread.o \
-  lj_bcwrite.o \
-  lj_carith.o \
-  lj_ccall.o \
-  lj_ccallback.o \
-  lj_cconv.o \
-  lj_cdata.o \
-  lj_char.o \
-  lj_clib.o \
-  lj_cparse.o \
-  lj_crecord.o \
-  lj_ctype.o \
-  lj_debug.o \
-  lj_dispatch.o \
-  lj_err.o \
-  lj_ffrecord.o \
-  lj_func.o \
-  lj_gc.o \
-  lj_gdbjit.o \
-  lj_ir.o \
-  lj_lex.o \
-  lj_lib.o \
-  lj_load.o \
-  lj_mcode.o \
-  lj_meta.o \
-  lj_obj.o \
-  lj_opt_dce.o \
-  lj_opt_fold.o \
-  lj_opt_loop.o \
-  lj_opt_mem.o \
-  lj_opt_narrow.o \
-  lj_opt_sink.o \
-  lj_opt_split.o \
-  lj_parse.o \
-  lj_record.o \
-  lj_snap.o \
-  lj_state.o \
-  lj_str.o \
-  lj_strscan.o \
-  lj_tab.o \
-  lj_trace.o \
-  lj_udata.o \
-  lj_vm.o \
-  lj_vmevent.o \
-  lj_vmmath.o
+	lib_aux.o \
+	lib_base.o \
+	lib_bit.o \
+	lib_debug.o \
+	lib_ffi.o \
+	lib_init.o \
+	lib_io.o \
+	lib_jit.o \
+	lib_math.o \
+	lib_os.o \
+	lib_package.o \
+	lib_string.o \
+	lib_table.o \
+	lj_alloc.o \
+	lj_api.o \
+	lj_asm.o \
+	lj_bc.o \
+	lj_bcread.o \
+	lj_bcwrite.o \
+	lj_carith.o \
+	lj_ccall.o \
+	lj_ccallback.o \
+	lj_cconv.o \
+	lj_cdata.o \
+	lj_char.o \
+	lj_clib.o \
+	lj_cparse.o \
+	lj_crecord.o \
+	lj_ctype.o \
+	lj_debug.o \
+	lj_dispatch.o \
+	lj_err.o \
+	lj_ffrecord.o \
+	lj_func.o \
+	lj_gc.o \
+	lj_gdbjit.o \
+	lj_ir.o \
+	lj_lex.o \
+	lj_lib.o \
+	lj_load.o \
+	lj_mcode.o \
+	lj_meta.o \
+	lj_obj.o \
+	lj_opt_dce.o \
+	lj_opt_fold.o \
+	lj_opt_loop.o \
+	lj_opt_mem.o \
+	lj_opt_narrow.o \
+	lj_opt_sink.o \
+	lj_opt_split.o \
+	lj_parse.o \
+	lj_record.o \
+	lj_snap.o \
+	lj_state.o \
+	lj_str.o \
+	lj_strscan.o \
+	lj_tab.o \
+	lj_trace.o \
+	lj_udata.o \
+	lj_vm.o \
+	lj_vmevent.o \
+	lj_vmmath.o
 
 EXTRA_DIST = InkAPITestTool.cc example_alarm_bin.sh example_prep.sh
 
 traffic_server_SOURCES = \
-  CacheControl.cc \
-  CacheControl.h \
-  ControlBase.cc \
-  ControlBase.h \
-  ControlMatcher.cc \
-  ControlMatcher.h \
-  CoreUtils.cc \
-  CoreUtils.h \
-  Crash.cc \
-  EventName.cc \
-  FetchSM.cc \
-  HostStatus.cc \
-  HostStatus.h \
-  IPAllow.cc \
-  IPAllow.h \
-  InkAPI.cc \
-  InkAPIInternal.h \
-  InkIOCoreAPI.cc \
-  Main.cc \
-  Main.h \
-  Milestones.h \
-  ParentConsistentHash.cc \
-  ParentConsistentHash.h \
-  ParentRoundRobin.cc \
-  ParentRoundRobin.h \
-  ParentSelectionStrategy.cc \
-  ParentSelection.cc \
-  ParentSelection.h \
-  Plugin.cc \
-  Plugin.h \
-  PluginVC.cc \
-  PluginVC.h \
-  ProtocolProbeSessionAccept.cc \
-  ProtocolProbeSessionAccept.h \
-  ProxyClientSession.cc \
-  ProxyClientSession.h \
-  ProxyClientTransaction.cc \
-  ProxyClientTransaction.h \
-  ReverseProxy.cc \
-  ReverseProxy.h \
-  SocksProxy.cc \
-  StatPages.cc \
-  StatPages.h \
-  Transform.cc \
-  Transform.h \
-  TransformInternal.h
+	CacheControl.cc \
+	CacheControl.h \
+	ControlBase.cc \
+	ControlBase.h \
+	ControlMatcher.cc \
+	ControlMatcher.h \
+	CoreUtils.cc \
+	CoreUtils.h \
+	Crash.cc \
+	EventName.cc \
+	FetchSM.cc \
+	HostStatus.cc \
+	HostStatus.h \
+	IPAllow.cc \
+	IPAllow.h \
+	InkAPI.cc \
+	InkAPIInternal.h \
+	InkIOCoreAPI.cc \
+	Main.cc \
+	Main.h \
+	Milestones.h \
+	ParentConsistentHash.cc \
+	ParentConsistentHash.h \
+	ParentRoundRobin.cc \
+	ParentRoundRobin.h \
+	ParentSelectionStrategy.cc \
+	ParentSelection.cc \
+	ParentSelection.h \
+	Plugin.cc \
+	Plugin.h \
+	PluginVC.cc \
+	PluginVC.h \
+	ProtocolProbeSessionAccept.cc \
+	ProtocolProbeSessionAccept.h \
+	ProxyClientSession.cc \
+	ProxyClientSession.h \
+	ProxyClientTransaction.cc \
+	ProxyClientTransaction.h \
+	ReverseProxy.cc \
+	ReverseProxy.h \
+	SocksProxy.cc \
+	StatPages.cc \
+	StatPages.h \
+	Transform.cc \
+	Transform.h \
+	TransformInternal.h
 
 if BUILD_TESTS
-traffic_server_SOURCES +=  \
-  InkAPITest.cc  \
-  RegressionSM.h \
-  RegressionSM.cc
+traffic_server_SOURCES += \
+	InkAPITest.cc \
+	RegressionSM.h \
+	RegressionSM.cc
 endif
 
 traffic_server_LDADD = \
-  http/libhttp.a \
-  http2/libhttp2.a \
-  http/remap/libhttp_remap.a \
-  logging/liblogging.a \
-  logging/liblogcollation.a \
-  hdrs/libhdrs.a  \
-  shared/libdiagsconfig.a  \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/iocore/utils/libinkutils.a \
-  $(top_builddir)/iocore/dns/libinkdns.a \
-  $(top_builddir)/iocore/hostdb/libinkhostdb.a \
-  $(top_builddir)/iocore/dns/libinkdns.a \
-  $(top_builddir)/iocore/cache/libinkcache.a \
-  $(top_builddir)/iocore/aio/libinkaio.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/lib/bindings/libbindings.la
+	http/libhttp.a \
+	http2/libhttp2.a \
+	http/remap/libhttp_remap.a \
+	logging/liblogging.a \
+	logging/liblogcollation.a \
+	hdrs/libhdrs.a \
+	shared/libdiagsconfig.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/iocore/utils/libinkutils.a \
+	$(top_builddir)/iocore/dns/libinkdns.a \
+	$(top_builddir)/iocore/hostdb/libinkhostdb.a \
+	$(top_builddir)/iocore/dns/libinkdns.a \
+	$(top_builddir)/iocore/cache/libinkcache.a \
+	$(top_builddir)/iocore/aio/libinkaio.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/lib/bindings/libbindings.la
 
 if BUILD_LUAJIT
 traffic_server_LDADD += \
-  $(top_builddir)/lib/luajit/src/libluajit.a
+	$(top_builddir)/lib/luajit/src/libluajit.a
 endif
 
 traffic_server_LDADD += \
-  $(top_builddir)/iocore/net/libinknet.a \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/tsconfig/libtsconfig.la \
-  @HWLOC_LIBS@ \
-  @LIBPCRE@ \
-  @LIBTCL@ \
-  @LIBRESOLV@ \
-  @LIBZ@ \
-  @LIBLZMA@ \
-  @LIBPROFILER@ \
-  @OPENSSL_LIBS@ \
-  -lm
+	$(top_builddir)/iocore/net/libinknet.a \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/tsconfig/libtsconfig.la \
+	@HWLOC_LIBS@ \
+	@LIBPCRE@ \
+	@LIBTCL@ \
+	@LIBRESOLV@ \
+	@LIBZ@ \
+	@LIBLZMA@ \
+	@LIBPROFILER@ \
+	@OPENSSL_LIBS@ \
+	-lm
 
 if BUILD_LUAJIT
 traffic_server_LDADD += $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%)
@@ -229,23 +229,23 @@ endif
 
 traffic_logcat_SOURCES = logcat.cc
 traffic_logcat_LDADD = \
-  logging/liblogging.a \
-  shared/libdiagsconfig.a \
-  shared/libUglyLogStubs.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/lib/bindings/libbindings.la
+	logging/liblogging.a \
+	shared/libdiagsconfig.a \
+	shared/libUglyLogStubs.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/lib/bindings/libbindings.la
 
 if BUILD_LUAJIT
 traffic_logcat_LDADD += \
-  $(top_builddir)/lib/luajit/src/libluajit.a
+	$(top_builddir)/lib/luajit/src/libluajit.a
 endif
 
 traffic_logcat_LDADD += \
-  @LIBTCL@ @HWLOC_LIBS@\
-  @LIBPROFILER@ -lm
+	@LIBTCL@ @HWLOC_LIBS@\
+	@LIBPROFILER@ -lm
 
 if SYSTEM_LUAJIT
 traffic_logcat_LDADD += @LIBLUAJIT@
@@ -253,14 +253,14 @@ endif
 
 traffic_logstats_SOURCES = logstats.cc
 traffic_logstats_LDADD = \
-  logging/liblogging.a \
-  shared/libdiagsconfig.a \
-  shared/libUglyLogStubs.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/lib/bindings/libbindings.la
+	logging/liblogging.a \
+	shared/libdiagsconfig.a \
+	shared/libUglyLogStubs.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/lib/bindings/libbindings.la
 
 if BUILD_LUAJIT
 traffic_logstats_LDADD += \
diff --git a/proxy/api/ts/Makefile.am b/proxy/api/ts/Makefile.am
index 5577006..bcf8f9e 100644
--- a/proxy/api/ts/Makefile.am
+++ b/proxy/api/ts/Makefile.am
@@ -19,9 +19,9 @@
 library_includedir=$(includedir)/ts
 
 library_include_HEADERS = \
-  ts.h \
-  remap.h \
-  experimental.h
+	ts.h \
+	remap.h \
+	experimental.h
 
 noinst_HEADERS = \
-  InkAPIPrivateIOCore.h
+	InkAPIPrivateIOCore.h
diff --git a/proxy/config/Makefile.am b/proxy/config/Makefile.am
index 1206018..a6c8c09 100644
--- a/proxy/config/Makefile.am
+++ b/proxy/config/Makefile.am
@@ -18,30 +18,30 @@
 
 SUBDIRS = body_factory
 EXTRA_DIST = \
-  records.config.default.in \
-  storage.config.default.in
+	records.config.default.in \
+	storage.config.default.in
 
 sysconfdir = $(pkgsysconfdir)
 nodist_sysconf_DATA = \
-  records.config.default \
-  storage.config.default
+	records.config.default \
+	storage.config.default
 
 dist_sysconf_DATA =	\
-  cache.config.default \
-  congestion.config.default \
-  hosting.config.default \
-  ip_allow.config.default \
-  log_hosts.config.default \
-  logging.config.default \
-  metrics.config.default \
-  parent.config.default \
-  plugin.config.default \
-  remap.config.default \
-  socks.config.default \
-  splitdns.config.default \
-  ssl_multicert.config.default \
-  ssl_server_name.config.default \
-  volume.config.default
+	cache.config.default \
+	congestion.config.default \
+	hosting.config.default \
+	ip_allow.config.default \
+	log_hosts.config.default \
+	logging.config.default \
+	metrics.config.default \
+	parent.config.default \
+	plugin.config.default \
+	remap.config.default \
+	socks.config.default \
+	splitdns.config.default \
+	ssl_multicert.config.default \
+	ssl_server_name.config.default \
+	volume.config.default
 
 install-exec-hook:
 	for dfltcfgfile in $(dist_sysconf_DATA) $(nodist_sysconf_DATA) ; \
diff --git a/proxy/config/body_factory/default/Makefile.am b/proxy/config/body_factory/default/Makefile.am
index d89311a..cdde92c 100644
--- a/proxy/config/body_factory/default/Makefile.am
+++ b/proxy/config/body_factory/default/Makefile.am
@@ -19,31 +19,31 @@
 bodyfactorydir = $(pkgsysconfdir)/body_factory/default
 
 dist_bodyfactory_DATA = \
-  access\#denied \
-  access\#proxy_auth_required \
-  access\#ssl_forbidden \
-  .body_factory_info \
-  cache\#not_in_cache \
-  cache\#read_error \
-  congestion\#retryAfter \
-  connect\#dns_failed \
-  connect\#failed_connect \
-  connect\#hangup \
-  default \
-  interception\#no_host \
-  README \
-  redirect\#moved_temporarily \
-  redirect\#moved_permanently \
-  request\#cycle_detected \
-  request\#no_content_length \
-  request\#invalid_content_length \
-  request\#no_host \
-  request\#scheme_unsupported \
-  request\#syntax_error \
-  response\#bad_response \
-  response\#bad_version \
-  timeout\#activity \
-  timeout\#inactivity \
-  transcoding\#unsupported \
-  urlrouting\#no_mapping
+	access\#denied \
+	access\#proxy_auth_required \
+	access\#ssl_forbidden \
+	.body_factory_info \
+	cache\#not_in_cache \
+	cache\#read_error \
+	congestion\#retryAfter \
+	connect\#dns_failed \
+	connect\#failed_connect \
+	connect\#hangup \
+	default \
+	interception\#no_host \
+	README \
+	redirect\#moved_temporarily \
+	redirect\#moved_permanently \
+	request\#cycle_detected \
+	request\#no_content_length \
+	request\#invalid_content_length \
+	request\#no_host \
+	request\#scheme_unsupported \
+	request\#syntax_error \
+	response\#bad_response \
+	response\#bad_version \
+	timeout\#activity \
+	timeout\#inactivity \
+	transcoding\#unsupported \
+	urlrouting\#no_mapping
 
diff --git a/proxy/congest/Makefile.am b/proxy/congest/Makefile.am
index 9b49948..74400cb 100644
--- a/proxy/congest/Makefile.am
+++ b/proxy/congest/Makefile.am
@@ -17,28 +17,28 @@
 #  limitations under the License.
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/proxy/shared \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/proxy/shared \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	$(TS_INCLUDES)
 
 noinst_LIBRARIES = libCongestionControl.a
 
 libCongestionControl_a_SOURCES = \
-  Congestion.cc \
-  Congestion.h \
-  CongestionDB.cc \
-  CongestionDB.h \
-  CongestionStats.cc \
-  CongestionStats.h \
-  MT_hashtable.h
+	Congestion.cc \
+	Congestion.h \
+	CongestionDB.cc \
+	CongestionDB.h \
+	CongestionStats.cc \
+	CongestionStats.h \
+	MT_hashtable.h
 
 if BUILD_TESTS
-  libCongestionControl_a_SOURCES +=   CongestionTest.cc
+libCongestionControl_a_SOURCES += CongestionTest.cc
 endif
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
index f75a0ce..f2e5c27 100644
--- a/proxy/hdrs/Makefile.am
+++ b/proxy/hdrs/Makefile.am
@@ -19,60 +19,60 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	$(TS_INCLUDES)
 
 noinst_LIBRARIES = libhdrs.a
 EXTRA_PROGRAMS = load_http_hdr
 
 # Http library source files.
 libhdrs_a_SOURCES = \
-  HTTP.cc \
-  HTTP.h \
-  HdrHeap.cc \
-  HdrHeap.h \
-  HdrTSOnly.cc \
-  HdrToken.cc \
-  HdrToken.h \
-  HdrUtils.cc \
-  HdrUtils.h \
-  HttpCompat.cc \
-  HttpCompat.h \
-  MIME.cc \
-  MIME.h \
-  URL.cc \
-  URL.h
+	HTTP.cc \
+	HTTP.h \
+	HdrHeap.cc \
+	HdrHeap.h \
+	HdrTSOnly.cc \
+	HdrToken.cc \
+	HdrToken.h \
+	HdrUtils.cc \
+	HdrUtils.h \
+	HttpCompat.cc \
+	HttpCompat.h \
+	MIME.cc \
+	MIME.h \
+	URL.cc \
+	URL.h
 
 if BUILD_TESTS
-  libhdrs_a_SOURCES += \
-    HdrTest.cc \
-    HdrTest.h
+libhdrs_a_SOURCES += \
+	HdrTest.cc \
+	HdrTest.h
 endif
 
 load_http_hdr_SOURCES = \
-  HTTP.h \
-  HdrHeap.h \
-  MIME.h \
-  load_http_hdr.cc
+	HTTP.h \
+	HdrHeap.h \
+	MIME.h \
+	load_http_hdr.cc
 
 load_http_hdr_LDADD = -L. -lhdrs \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTCL@
+	$(top_builddir)/lib/ts/libtsutil.la \
+	@LIBTCL@
 
 check_PROGRAMS = test_mime
 
 TESTS = test_mime
 
 test_mime_LDADD = -L. -lhdrs \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
-  @HWLOC_LIBS@ \
-  @LIBTCL@ @LIBCAP@
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
+	@HWLOC_LIBS@ \
+	@LIBTCL@ @LIBCAP@
 
 test_mime_SOURCES = test_mime.cc
 
diff --git a/proxy/http/Makefile.am b/proxy/http/Makefile.am
index ac0eaae..c437e95 100644
--- a/proxy/http/Makefile.am
+++ b/proxy/http/Makefile.am
@@ -21,64 +21,64 @@ include $(top_srcdir)/build/tidy.mk
 SUBDIRS = remap
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/shared \
-  -I$(abs_top_srcdir)/proxy/http/remap \
-  -I$(abs_top_srcdir)/proxy/logging \
-  -I$(abs_top_srcdir)/proxy/http2 \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/shared \
+	-I$(abs_top_srcdir)/proxy/http/remap \
+	-I$(abs_top_srcdir)/proxy/logging \
+	-I$(abs_top_srcdir)/proxy/http2 \
+	$(TS_INCLUDES)
 
 noinst_HEADERS = HttpProxyServerMain.h
 noinst_LIBRARIES = libhttp.a
 
 libhttp_a_SOURCES = \
-  HttpSessionAccept.cc \
-  HttpSessionAccept.h \
-  HttpBodyFactory.cc \
-  HttpBodyFactory.h \
-  HttpCacheSM.cc \
-  HttpCacheSM.h \
-  Http1ClientSession.cc \
-  Http1ClientSession.h \
-  Http1ClientTransaction.cc \
-  Http1ClientTransaction.h \
-  HttpConfig.cc \
-  HttpConfig.h \
-  HttpConnectionCount.cc \
-  HttpConnectionCount.h \
-  HttpDebugNames.cc \
-  HttpDebugNames.h \
-  HttpPages.cc \
-  HttpPages.h \
-  HttpProxyServerMain.cc \
-  HttpProxyServerMain.h \
-  HttpSM.cc \
-  HttpSM.h \
-  HttpServerSession.cc \
-  HttpServerSession.h \
-  HttpSessionManager.cc \
-  HttpSessionManager.h \
-  HttpTransact.cc \
-  HttpTransact.h \
-  HttpTransactCache.cc \
-  HttpTransactCache.h \
-  HttpTransactHeaders.cc \
-  HttpTransactHeaders.h \
-  HttpTunnel.cc \
-  HttpTunnel.h \
-  HttpUpdateSM.cc \
-  HttpUpdateSM.h \
-  ForwardedConfig.cc
+	HttpSessionAccept.cc \
+	HttpSessionAccept.h \
+	HttpBodyFactory.cc \
+	HttpBodyFactory.h \
+	HttpCacheSM.cc \
+	HttpCacheSM.h \
+	Http1ClientSession.cc \
+	Http1ClientSession.h \
+	Http1ClientTransaction.cc \
+	Http1ClientTransaction.h \
+	HttpConfig.cc \
+	HttpConfig.h \
+	HttpConnectionCount.cc \
+	HttpConnectionCount.h \
+	HttpDebugNames.cc \
+	HttpDebugNames.h \
+	HttpPages.cc \
+	HttpPages.h \
+	HttpProxyServerMain.cc \
+	HttpProxyServerMain.h \
+	HttpSM.cc \
+	HttpSM.h \
+	HttpServerSession.cc \
+	HttpServerSession.h \
+	HttpSessionManager.cc \
+	HttpSessionManager.h \
+	HttpTransact.cc \
+	HttpTransact.h \
+	HttpTransactCache.cc \
+	HttpTransactCache.h \
+	HttpTransactHeaders.cc \
+	HttpTransactHeaders.h \
+	HttpTunnel.cc \
+	HttpTunnel.h \
+	HttpUpdateSM.cc \
+	HttpUpdateSM.h \
+	ForwardedConfig.cc
 
 if BUILD_TESTS
-  libhttp_a_SOURCES += HttpUpdateTester.cc \
-    RegressionHttpTransact.cc
+libhttp_a_SOURCES += HttpUpdateTester.cc \
+	RegressionHttpTransact.cc
 endif
 
 check_PROGRAMS = \
@@ -87,15 +87,15 @@ test_ForwardedConfig
 TESTS = $(check_PROGRAMS)
 
 test_ForwardedConfig_CPPFLAGS = $(AM_CPPFLAGS)\
-  -I$(abs_top_srcdir)/tests/include
+	-I$(abs_top_srcdir)/tests/include
 
 test_ForwardedConfig_SOURCES = \
-  unit-tests/test_ForwardedConfig.cc \
-  ForwardedConfig.cc \
-  unit-tests/test_ForwardedConfig_mocks.cc
+	unit-tests/test_ForwardedConfig.cc \
+	ForwardedConfig.cc \
+	unit-tests/test_ForwardedConfig_mocks.cc
 
 test_ForwardedConfig_LDADD = \
-  $(top_builddir)/lib/ts/libtsutil.la
+	$(top_builddir)/lib/ts/libtsutil.la
 
 clang-tidy-local: $(libhttp_a_SOURCES) $(noinst_HEADERS)
 	$(CXX_Clang_Tidy)
diff --git a/proxy/http/remap/Makefile.am b/proxy/http/remap/Makefile.am
index 3d1762e..b62d30b 100644
--- a/proxy/http/remap/Makefile.am
+++ b/proxy/http/remap/Makefile.am
@@ -19,36 +19,36 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/shared \
-  -I$(abs_top_srcdir)/proxy/http \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/shared \
+	-I$(abs_top_srcdir)/proxy/http \
+	$(TS_INCLUDES)
 
 noinst_LIBRARIES = libhttp_remap.a
 
 libhttp_remap_a_SOURCES = \
-  AclFiltering.cc \
-  AclFiltering.h \
-  RemapConfig.cc \
-  RemapConfig.h \
-  RemapPluginInfo.cc \
-  RemapPluginInfo.h \
-  RemapPlugins.cc \
-  RemapPlugins.h \
-  RemapProcessor.cc \
-  RemapProcessor.h \
-  UrlMapping.cc \
-  UrlMapping.h \
-  UrlMappingPathIndex.cc \
-  UrlMappingPathIndex.h \
-  UrlRewrite.cc \
-  UrlRewrite.h
+	AclFiltering.cc \
+	AclFiltering.h \
+	RemapConfig.cc \
+	RemapConfig.h \
+	RemapPluginInfo.cc \
+	RemapPluginInfo.h \
+	RemapPlugins.cc \
+	RemapPlugins.h \
+	RemapProcessor.cc \
+	RemapProcessor.h \
+	UrlMapping.cc \
+	UrlMapping.h \
+	UrlMappingPathIndex.cc \
+	UrlMappingPathIndex.h \
+	UrlRewrite.cc \
+	UrlRewrite.h
 
 clang-tidy-local: $(libhttp_remap_a_SOURCES)
 	$(CXX_Clang_Tidy)
diff --git a/proxy/http2/Makefile.am b/proxy/http2/Makefile.am
index c0790c2..67e2f5b 100644
--- a/proxy/http2/Makefile.am
+++ b/proxy/http2/Makefile.am
@@ -19,85 +19,85 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/shared \
-  -I$(abs_top_srcdir)/proxy/http/remap \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/shared \
+	-I$(abs_top_srcdir)/proxy/http/remap \
+	$(TS_INCLUDES)
 
 noinst_LIBRARIES = libhttp2.a
 
 libhttp2_a_SOURCES = \
-  HPACK.cc \
-  HPACK.h \
-  HTTP2.cc \
-  HTTP2.h \
-  Http2ClientSession.cc \
-  Http2ClientSession.h \
-  Http2ConnectionState.cc \
-  Http2ConnectionState.h \
-  Http2DebugNames.cc \
-  Http2DebugNames.h \
-  Http2DependencyTree.h \
-  Http2Stream.cc \
-  Http2Stream.h \
-  Http2SessionAccept.cc \
-  Http2SessionAccept.h \
-  HuffmanCodec.cc \
-  HuffmanCodec.h
+	HPACK.cc \
+	HPACK.h \
+	HTTP2.cc \
+	HTTP2.h \
+	Http2ClientSession.cc \
+	Http2ClientSession.h \
+	Http2ConnectionState.cc \
+	Http2ConnectionState.h \
+	Http2DebugNames.cc \
+	Http2DebugNames.h \
+	Http2DependencyTree.h \
+	Http2Stream.cc \
+	Http2Stream.h \
+	Http2SessionAccept.cc \
+	Http2SessionAccept.h \
+	HuffmanCodec.cc \
+	HuffmanCodec.h
 
 if BUILD_TESTS
-  libhttp2_a_SOURCES += \
-	  RegressionHPACK.cc
+libhttp2_a_SOURCES += \
+	RegressionHPACK.cc
 endif
 
 check_PROGRAMS = \
-  test_Huffmancode \
-  test_Http2DependencyTree \
-  test_HPACK
+	test_Huffmancode \
+	test_Http2DependencyTree \
+	test_HPACK
 
 TESTS = \
-  test_Huffmancode \
-  test_Http2DependencyTree \
-  test_HPACK
+	test_Huffmancode \
+	test_Http2DependencyTree \
+	test_HPACK
 
 test_Huffmancode_LDADD = \
-  $(top_builddir)/lib/ts/libtsutil.la
+	$(top_builddir)/lib/ts/libtsutil.la
 
 test_Huffmancode_SOURCES = \
-  test_Huffmancode.cc \
-  HuffmanCodec.cc \
-  HuffmanCodec.h
+	test_Huffmancode.cc \
+	HuffmanCodec.cc \
+	HuffmanCodec.h
 
 test_Http2DependencyTree_LDADD = \
-  $(top_builddir)/lib/ts/libtsutil.la
+	$(top_builddir)/lib/ts/libtsutil.la
 
 test_Http2DependencyTree_SOURCES = \
-  test_Http2DependencyTree.cc \
-  Http2DependencyTree.h
+	test_Http2DependencyTree.cc \
+	Http2DependencyTree.h
 
 test_HPACK_LDADD = \
-  $(top_builddir)/proxy/hdrs/libhdrs.a \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a \
-  $(top_builddir)/lib/records/librecords_p.a \
-  $(top_builddir)/mgmt/libmgmt_p.la \
-  $(top_builddir)/proxy/shared/libUglyLogStubs.a \
-  @LIBTCL@ \
-  @HWLOC_LIBS@
+	$(top_builddir)/proxy/hdrs/libhdrs.a \
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a \
+	$(top_builddir)/lib/records/librecords_p.a \
+	$(top_builddir)/mgmt/libmgmt_p.la \
+	$(top_builddir)/proxy/shared/libUglyLogStubs.a \
+	@LIBTCL@ \
+	@HWLOC_LIBS@
 
 test_HPACK_SOURCES = \
-  test_HPACK.cc \
-  HuffmanCodec.cc \
-  HuffmanCodec.h \
-  HPACK.cc \
-  HPACK.h
+	test_HPACK.cc \
+	HuffmanCodec.cc \
+	HuffmanCodec.h \
+	HPACK.cc \
+	HPACK.h
 
 clang-tidy-local: $(libhttp2_a_SOURCES) $(test_Huffmancode_SOURCES) \
 		$(test_Http2DependencyTree_SOURCES) $(test_HPACK_SOURCES)
diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index bf4feec..90a7caf 100644
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -19,21 +19,21 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/proxy/http/remap \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/shared \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/proxy/http/remap \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/shared \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	$(TS_INCLUDES)
 
 if BUILD_LUAJIT
 AM_CPPFLAGS += \
-  -I$(abs_top_srcdir)/lib/luajit/src
+	-I$(abs_top_srcdir)/lib/luajit/src
 endif
 
 EXTRA_DIST = LogStandalone.cc
@@ -41,60 +41,60 @@ EXTRA_DIST = LogStandalone.cc
 noinst_LIBRARIES = liblogging.a liblogcollation.a
 
 liblogging_a_SOURCES = \
-  Log.cc \
-  Log.h \
-  LogAccess.cc \
-  LogAccess.h \
-  LogAccessHttp.cc \
-  LogAccessHttp.h \
-  LogBindings.cc \
-  LogBindings.h \
-  LogBuffer.cc \
-  LogBuffer.h \
-  LogBufferSink.h \
-  LogConfig.cc \
-  LogConfig.h \
-  LogField.cc \
-  LogField.h \
-  LogFieldAliasMap.cc \
-  LogFieldAliasMap.h \
-  LogFile.cc \
-  LogFile.h \
-  LogFilter.cc \
-  LogFilter.h \
-  LogFormat.cc \
-  LogFormat.h \
-  LogHost.cc \
-  LogHost.h \
-  LogLimits.h \
-  LogObject.cc \
-  LogObject.h \
-  LogSock.cc \
-  LogSock.h \
-  LogUtils.cc \
-  LogUtils.h
+	Log.cc \
+	Log.h \
+	LogAccess.cc \
+	LogAccess.h \
+	LogAccessHttp.cc \
+	LogAccessHttp.h \
+	LogBindings.cc \
+	LogBindings.h \
+	LogBuffer.cc \
+	LogBuffer.h \
+	LogBufferSink.h \
+	LogConfig.cc \
+	LogConfig.h \
+	LogField.cc \
+	LogField.h \
+	LogFieldAliasMap.cc \
+	LogFieldAliasMap.h \
+	LogFile.cc \
+	LogFile.h \
+	LogFilter.cc \
+	LogFilter.h \
+	LogFormat.cc \
+	LogFormat.h \
+	LogHost.cc \
+	LogHost.h \
+	LogLimits.h \
+	LogObject.cc \
+	LogObject.h \
+	LogSock.cc \
+	LogSock.h \
+	LogUtils.cc \
+	LogUtils.h
 
 liblogcollation_a_SOURCES = \
-  LogCollationAccept.cc \
-  LogCollationAccept.h \
-  LogCollationBase.h \
-  LogCollationClientSM.cc \
-  LogCollationClientSM.h \
-  LogCollationHostSM.cc \
-  LogCollationHostSM.h
+	LogCollationAccept.cc \
+	LogCollationAccept.h \
+	LogCollationBase.h \
+	LogCollationClientSM.cc \
+	LogCollationClientSM.h \
+	LogCollationHostSM.cc \
+	LogCollationHostSM.h
 
 check_PROGRAMS = \
-  test_LogUtils
+	test_LogUtils
 
 TESTS = \
-  test_LogUtils
+	test_LogUtils
 
 test_LogUtils_LDADD = \
-  $(top_builddir)/lib/ts/libtsutil.la \
-  $(top_builddir)/iocore/eventsystem/libinkevent.a
+	$(top_builddir)/lib/ts/libtsutil.la \
+	$(top_builddir)/iocore/eventsystem/libinkevent.a
 
 test_LogUtils_SOURCES = \
-  test_LogUtils.cc
+	test_LogUtils.cc
 
 clang-tidy-local: $(liblogging_a_SOURCES) $(liblogcollation_a_SOURCES) $(EXTRA_DIST)
 	$(CXX_Clang_Tidy)
diff --git a/proxy/shared/Makefile.am b/proxy/shared/Makefile.am
index acc2f3e..f20979f 100644
--- a/proxy/shared/Makefile.am
+++ b/proxy/shared/Makefile.am
@@ -20,29 +20,29 @@ include $(top_srcdir)/build/tidy.mk
 
 # Note that hdrs is targeted from ../Makefile.am
 noinst_LIBRARIES = \
-  libdiagsconfig.a \
-  libUglyLogStubs.a
+	libdiagsconfig.a \
+	libUglyLogStubs.a
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib/records \
-  -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/api \
-  -I$(abs_top_srcdir)/mgmt/api/include \
-  -I$(abs_top_srcdir)/mgmt/utils \
-  -I$(abs_top_srcdir) \
-  -I$(abs_top_srcdir)/proxy \
-  -I$(abs_top_srcdir)/proxy/http \
-  -I$(abs_top_srcdir)/proxy/hdrs \
-  -I$(abs_top_srcdir)/proxy/logging \
-  -I$(abs_top_srcdir)/lib \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib/records \
+	-I$(abs_top_srcdir)/mgmt \
+	-I$(abs_top_srcdir)/mgmt/api \
+	-I$(abs_top_srcdir)/mgmt/api/include \
+	-I$(abs_top_srcdir)/mgmt/utils \
+	-I$(abs_top_srcdir) \
+	-I$(abs_top_srcdir)/proxy \
+	-I$(abs_top_srcdir)/proxy/http \
+	-I$(abs_top_srcdir)/proxy/hdrs \
+	-I$(abs_top_srcdir)/proxy/logging \
+	-I$(abs_top_srcdir)/lib \
+	$(TS_INCLUDES)
 
 libdiagsconfig_a_SOURCES = \
-  DiagsConfig.cc
+	DiagsConfig.cc
 
 libUglyLogStubs_a_SOURCES = \
-  UglyLogStubs.cc
+	UglyLogStubs.cc
 
 clang-tidy-local: $(libdiagsconfig_a_SOURCES) $(libUglyLogStubs_a_SOURCES)
 	$(CXX_Clang_Tidy)
diff --git a/rc/Makefile.am b/rc/Makefile.am
index 98d0814..80b7836 100644
--- a/rc/Makefile.am
+++ b/rc/Makefile.am
@@ -17,4 +17,4 @@
 #  limitations under the License.
 
 dist_bin_SCRIPTS = \
-  trafficserver
+	trafficserver
diff --git a/.editorconfig b/tests/gold_tests/autest-site/.editorconfig
similarity index 70%
copy from .editorconfig
copy to tests/gold_tests/autest-site/.editorconfig
index 2602276..b3d77db 100644
--- a/.editorconfig
+++ b/tests/gold_tests/autest-site/.editorconfig
@@ -18,26 +18,9 @@
 # Configuration file for EditorConfig
 # More information is available under http://EditorConfig.org
 
-# Ignore any other files further up in the file system
-root = true
+root = false
 
-# Defaults
-[*]
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-max_line_length = 132
 # Python
-[*.py]
+[*.ext]
 indent_size = 4
 charset = utf-8
-# Perl
-[{*.pm,*.pl}]
-indent_size = 4
-charset = utf-8
-# Automake files. TODO: Should this do indent_style = tab ?
-[*.am]
-trim_trailing_whitespace = false
-indent_size = 2
diff --git a/tests/unit_tests/Makefile.am b/tests/unit_tests/Makefile.am
index b217e73..84db12b 100644
--- a/tests/unit_tests/Makefile.am
+++ b/tests/unit_tests/Makefile.am
@@ -18,8 +18,8 @@
 include $(top_srcdir)/build/tidy.mk
 
 AM_CPPFLAGS += \
-  -I$(abs_top_srcdir) \
-  $(TS_INCLUDES)
+	-I$(abs_top_srcdir) \
+	$(TS_INCLUDES)
 
 bin_PROGRAMS = unit_tests
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 08ce762..cad6846 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,10 +23,10 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = trafficserver.pc
 
 AM_CPPFLAGS += \
-  $(iocore_include_dirs) \
-  -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/wccp \
-  $(TS_INCLUDES)
+	$(iocore_include_dirs) \
+	-I$(abs_top_srcdir)/lib \
+	-I$(abs_top_srcdir)/lib/wccp \
+	$(TS_INCLUDES)
 
 if BUILD_TEST_TOOLS
 bin_PROGRAMS = jtest/jtest
@@ -46,11 +46,11 @@ noinst_PROGRAMS += http_load/http_load
 endif
 
 http_load_http_load_LDADD = @OPENSSL_LIBS@
-http_load_http_load_SOURCES =  \
-  http_load/http_load.c \
-  http_load/timers.c \
-  http_load/port.h \
-  http_load/timers.h
+http_load_http_load_SOURCES = \
+	http_load/http_load.c \
+	http_load/timers.c \
+	http_load/port.h \
+	http_load/timers.h
 
 endif
 

-- 
To stop receiving notification emails like this one, please contact
dagit@apache.org.