Updated Branches: refs/heads/master 2528ac7b7 -> 64a6c828d
TS-2042 Remove remnants of unused vingid command line option Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/64a6c828 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/64a6c828 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/64a6c828 Branch: refs/heads/master Commit: 64a6c828de0ca82a404a11ba6ff12d3f5f4ca273 Parents: 2528ac7 Author: Leif Hedstrom <[email protected]> Authored: Wed Jul 17 18:37:10 2013 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Wed Jul 17 18:37:10 2013 -0600 ---------------------------------------------------------------------- CHANGES | 2 ++ doc/admin/commands/traffic_manager.en.rst | 1 - mgmt/Main.cc | 7 ------- proxy/Main.cc | 3 --- 4 files changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/64a6c828/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index dbf6c79..02972a9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.3.5 + *) [TS-2042] Remove remnants of unused vingid command line option. + *) [TS-1898] improve cluster read/write performance. *) [TS-2036] Enable mgmt update (traffic_line -x) for plugins. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/64a6c828/doc/admin/commands/traffic_manager.en.rst ---------------------------------------------------------------------- diff --git a/doc/admin/commands/traffic_manager.en.rst b/doc/admin/commands/traffic_manager.en.rst index 7e3f8f7..2a82fcd 100644 --- a/doc/admin/commands/traffic_manager.en.rst +++ b/doc/admin/commands/traffic_manager.en.rst @@ -37,7 +37,6 @@ Description .. option:: -tsArgs ARGUMENTS .. option:: -proxyPort PORT .. option:: -proxyBackDoor PORT -.. option:: -vingid VG .. option:: -schema FILE .. option:: -version http://git-wip-us.apache.org/repos/asf/trafficserver/blob/64a6c828/mgmt/Main.cc ---------------------------------------------------------------------- diff --git a/mgmt/Main.cc b/mgmt/Main.cc index 4cf5b27..9b685bb 100644 --- a/mgmt/Main.cc +++ b/mgmt/Main.cc @@ -519,12 +519,6 @@ main(int argc, char **argv) } else if (strcmp(argv[i], "-proxyBackDoor") == 0) { ++i; proxy_backdoor = atoi(argv[i]); - } else if (strcmp(argv[i], "-vingid") == 0) { - // smanager/cnp integration, this argument is - // really just a dummy argument used so that - // smanager can find all instances of a - // particular TM process. - ++i; } else if (strcmp(argv[i], "-schema") == 0) { // hidden option ++i; @@ -981,7 +975,6 @@ printUsage() fprintf(stderr, " -debug <tags> Enable the given debug tags\n"); fprintf(stderr, " -action <tags> Enable the given action tags.\n"); fprintf(stderr, " -version or -V Print version id and exit.\n"); - fprintf(stderr, " -vingid <id> Vingid Flag\n"); fprintf(stderr, "\n"); fprintf(stderr, " [...] can be one+ of: [config process node cluster local all]\n"); fprintf(stderr, "----------------------------------------------------------------------------\n"); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/64a6c828/proxy/Main.cc ---------------------------------------------------------------------- diff --git a/proxy/Main.cc b/proxy/Main.cc index 1f8d269..4928c01 100644 --- a/proxy/Main.cc +++ b/proxy/Main.cc @@ -160,8 +160,6 @@ static int history_info_enabled = 1; static inkcoreapi DiagsConfig *diagsConfig = NULL; HttpBodyFactory *body_factory = NULL; -static char vingid_flag[255] = ""; - static int accept_mss = 0; static int cmd_line_dprintf_level = 0; // default debug output level fro ink_dprintf function @@ -216,7 +214,6 @@ static const ArgumentDescription argument_descriptions[] = { {"command", 'C', "Maintenance Command to Execute", "S511", &command_string, "PROXY_COMMAND_STRING", NULL}, {"clear_hostdb", 'k', "Clear HostDB on Startup", "F", &auto_clear_hostdb_flag, "PROXY_CLEAR_HOSTDB", NULL}, {"clear_cache", 'K', "Clear Cache on Startup", "F", &cacheProcessor.auto_clear_flag, "PROXY_CLEAR_CACHE", NULL}, - {"vingid", 'v', "Vingid Flag", "S255", vingid_flag, "PROXY_VINGID", NULL}, #if defined(linux) {"read_core", 'c', "Read Core file", "S255", &core_file, NULL, NULL}, #endif
