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 2015/06/09 00:39:06 UTC

[1/2] trafficserver git commit: TS-3368 Mark traffic_line as deprecated

Repository: trafficserver
Updated Branches:
  refs/heads/master c6ef7b496 -> 9bb97769e


TS-3368 Mark traffic_line as deprecated


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

Branch: refs/heads/master
Commit: b5a1cc466817d47071b01d9e70d61f6157cc6e90
Parents: c6ef7b4
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Jun 8 12:10:08 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Jun 8 16:36:30 2015 -0600

----------------------------------------------------------------------
 cmd/traffic_line/traffic_line.cc           | 3 ++-
 doc/reference/commands/traffic_line.en.rst | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b5a1cc46/cmd/traffic_line/traffic_line.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_line/traffic_line.cc b/cmd/traffic_line/traffic_line.cc
index 77e65eb..0c10839 100644
--- a/cmd/traffic_line/traffic_line.cc
+++ b/cmd/traffic_line/traffic_line.cc
@@ -308,7 +308,8 @@ main(int /* argc ATS_UNUSED */, const char **argv)
   TSMgmtError status;
 
   // build the application information structure
-  appVersionInfo.setup(PACKAGE_NAME, "traffic_line", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
+  appVersionInfo.setup(PACKAGE_NAME, "traffic_line [DEPRECATED]", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE, BUILD_PERSON,
+                       "");
 
   program_name = appVersionInfo.AppStr;
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b5a1cc46/doc/reference/commands/traffic_line.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/commands/traffic_line.en.rst b/doc/reference/commands/traffic_line.en.rst
index 212acbe..bf74fae 100644
--- a/doc/reference/commands/traffic_line.en.rst
+++ b/doc/reference/commands/traffic_line.en.rst
@@ -19,6 +19,12 @@
 traffic_line
 ============
 
+.. note::
+
+   This utility is deprecated as of v6.0.0, and replaced with
+   :program:`traffic_ctl`. You should change your tools / scripts to use this
+   new application instead.
+
 Synopsis
 ========
 


[2/2] trafficserver git commit: Added TS-3368.

Posted by zw...@apache.org.
Added TS-3368.


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

Branch: refs/heads/master
Commit: 9bb97769e30b1dc0ce9b03ba2d86d59007276c20
Parents: b5a1cc4
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Jun 8 16:37:09 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Jun 8 16:37:09 2015 -0600

----------------------------------------------------------------------
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9bb97769/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 0a51854..3323604 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 6.0.0
 
+  *) [TS-3368] Mark traffic_line as deprecated.
+
   *) [TS-3668] cache_promote: Make cache promotion explicit for internal
    requests. This helps when e.g. background_fetch is used together with this
    plugin.