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 2013/04/15 23:20:10 UTC

[41/50] git commit: Remove obsolete mgr.cnf config file

Remove obsolete mgr.cnf config file


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

Branch: refs/heads/3.3.x
Commit: b3d0fe7b58169a9ded90bea6a9d002b75d1e29a4
Parents: 2d24177
Author: James Peach <jp...@apache.org>
Authored: Mon Apr 8 14:21:23 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Apr 8 14:21:23 2013 -0700

----------------------------------------------------------------------
 mgmt/Main.cc                 |    3 ---
 proxy/config/Makefile.am     |    1 -
 proxy/config/mgr.cnf.default |    9 ---------
 3 files changed, 0 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b3d0fe7b/mgmt/Main.cc
----------------------------------------------------------------------
diff --git a/mgmt/Main.cc b/mgmt/Main.cc
index 06f3e6a..da80cad 100644
--- a/mgmt/Main.cc
+++ b/mgmt/Main.cc
@@ -1068,9 +1068,6 @@ fileUpdated(char *fname)
   } else if (strcmp(fname, "hosting.config") == 0) {
     lmgmt->signalFileChange("proxy.config.cache.hosting_filename");
 
-  } else if (strcmp(fname, "mgr.cnf") == 0) {
-    mgmt_log(stderr, "[fileUpdated] mgr.cnf file has been modified\n");
-
   } else if (strcmp(fname, "log_hosts.config") == 0) {
     lmgmt->signalFileChange("proxy.config.log.hosts_config_file");
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b3d0fe7b/proxy/config/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/config/Makefile.am b/proxy/config/Makefile.am
index 19de021..21f7f72 100644
--- a/proxy/config/Makefile.am
+++ b/proxy/config/Makefile.am
@@ -35,7 +35,6 @@ dist_sysconf_DATA =	\
   ip_allow.config.default \
   log_hosts.config.default \
   logs_xml.config.default \
-  mgr.cnf.default \
   parent.config.default \
   volume.config.default \
   plugin.config.default \

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b3d0fe7b/proxy/config/mgr.cnf.default
----------------------------------------------------------------------
diff --git a/proxy/config/mgr.cnf.default b/proxy/config/mgr.cnf.default
deleted file mode 100644
index 0f909cd..0000000
--- a/proxy/config/mgr.cnf.default
+++ /dev/null
@@ -1,9 +0,0 @@
-#Entry type: usmUserEntry
-#Format:  usmUserEngineID  (octetString)
-#         usmUserName  (text)
-#         usmUserAuthProtocol  (OID)
-#         usmUserPrivProtocol  (OID)
-#         usmUserStorageType  (nonVolatile, permanent, readOnly)
-#         usmTargetTag  (text)
-usmUserEntry  localSnmpID rootNoAuthTemplate usmNoAuthProtocol \
-    usmNoPrivProtocol readOnly -