You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2014/05/22 00:59:14 UTC
git commit: TS-2274 Set the default for proxy.config.env_prep to NULL
Repository: trafficserver
Updated Branches:
refs/heads/master d43697423 -> f660f5667
TS-2274 Set the default for proxy.config.env_prep to NULL
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f660f566
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f660f566
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f660f566
Branch: refs/heads/master
Commit: f660f5667d99b3bb36ab4f9bd33740b9db2144b4
Parents: d436974
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed May 21 16:59:09 2014 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed May 21 16:59:09 2014 -0600
----------------------------------------------------------------------
CHANGES | 1 +
mgmt/RecordsConfig.cc | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f660f566/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index ee860eb..f13812a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ Changes with Apache Traffic Server 5.0.0
- proxy.config.http.connect_ports -> 443
- proxy.config.log.custom_logs_enabled -> 1
- proxy.config.spdy.client.max_concurrent_streams -> 100
+ - proxy.config.env_prep -> NULL
*) [TS-2824] Revert TS-2592.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f660f566/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 47a952c..31506a5 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -52,7 +52,7 @@ RecordElement RecordsConfig[] = {
,
{RECT_CONFIG, "proxy.config.proxy_binary_opts", RECD_STRING, "-M", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.env_prep", RECD_STRING, "example_prep.sh", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.env_prep", RECD_STRING, NULL, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.config_dir", RECD_STRING, TS_BUILD_SYSCONFDIR, RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,