diff options
| -rw-r--r-- | doc/developer/workflow.rst | 10 | ||||
| -rw-r--r-- | lib/command.c | 4 | ||||
| -rw-r--r-- | lib/command.h | 2 | ||||
| -rw-r--r-- | lib/vty.c | 2 | ||||
| -rw-r--r-- | vtysh/vtysh.c | 1 | ||||
| -rw-r--r-- | vtysh/vtysh_config.c | 10 |
6 files changed, 13 insertions, 16 deletions
diff --git a/doc/developer/workflow.rst b/doc/developer/workflow.rst index 80029cbd1c..a6a950f685 100644 --- a/doc/developer/workflow.rst +++ b/doc/developer/workflow.rst @@ -256,7 +256,15 @@ After submitting your changes - Wait for reviewers. Someone will review your code or be assigned to review your code. - - Respond to any comments or concerns the reviewer has. + - Respond to any comments or concerns the reviewer has. Use e-mail or + add a comment via github to respond or to let the reviewer know how + their comment or concern is addressed. + - An author must never delete or manually dismiss someone else's comments + or review. (A review may be overridden by agreement in the weekly + technical meeting.) + - Automatically generated comments, e.g., those generated by CI systems, + may be deleted by authors and others when such comments are not the most + recent results from that automated comment source. - After all comments and concerns are addressed, expect your patch to be merged. diff --git a/lib/command.c b/lib/command.c index 7c7fddeea5..3bbea63060 100644 --- a/lib/command.c +++ b/lib/command.c @@ -55,7 +55,6 @@ const char *node_names[] = { "auth enable", // AUTH_ENABLE_NODE, "enable", // ENABLE_NODE, "config", // CONFIG_NODE, - "service", // SERVICE_NODE, "debug", // DEBUG_NODE, "vrf debug", // VRF_DEBUG_NODE, "vnc debug", // DEBUG_VNC_NODE, @@ -97,7 +96,6 @@ const char *node_names[] = { "ldp l2vpn", // LDP_L2VPN_NODE, "ldp", // LDP_PSEUDOWIRE_NODE, "isis", // ISIS_NODE, - "masc", // MASC_NODE, "irdp", // IRDP_NODE, "static ip", // IP_NODE, "ipv4 access list", // ACCESS_NODE, @@ -1314,7 +1312,6 @@ void cmd_exit(struct vty *vty) case LDP_L2VPN_NODE: case ISIS_NODE: case KEYCHAIN_NODE: - case MASC_NODE: case RMAP_NODE: case VTY_NODE: vty->node = CONFIG_NODE; @@ -1425,7 +1422,6 @@ DEFUN (config_end, case ISIS_NODE: case KEYCHAIN_NODE: case KEYCHAIN_KEY_NODE: - case MASC_NODE: case VTY_NODE: case LINK_PARAMS_NODE: vty_config_unlock(vty); diff --git a/lib/command.h b/lib/command.h index a7fa3a1692..26c1ac73b9 100644 --- a/lib/command.h +++ b/lib/command.h @@ -78,7 +78,6 @@ enum node_type { AUTH_ENABLE_NODE, /* Authentication mode for change enable. */ ENABLE_NODE, /* Enable node. */ CONFIG_NODE, /* Config node. Default mode of config file. */ - SERVICE_NODE, /* Service node. */ DEBUG_NODE, /* Debug node. */ VRF_DEBUG_NODE, /* Vrf Debug node. */ DEBUG_VNC_NODE, /* Debug VNC node. */ @@ -120,7 +119,6 @@ enum node_type { LDP_L2VPN_NODE, /* LDP L2VPN node */ LDP_PSEUDOWIRE_NODE, /* LDP Pseudowire node */ ISIS_NODE, /* ISIS protocol mode */ - MASC_NODE, /* MASC for multicast. */ IRDP_NODE, /* ICMP Router Discovery Protocol mode. */ IP_NODE, /* Static ip route node. */ ACCESS_NODE, /* Access list node. */ @@ -731,7 +731,6 @@ static void vty_end_config(struct vty *vty) case ISIS_NODE: case KEYCHAIN_NODE: case KEYCHAIN_KEY_NODE: - case MASC_NODE: case VTY_NODE: case BGP_EVPN_VNI_NODE: vty_config_unlock(vty); @@ -1128,7 +1127,6 @@ static void vty_stop_input(struct vty *vty) case ISIS_NODE: case KEYCHAIN_NODE: case KEYCHAIN_KEY_NODE: - case MASC_NODE: case VTY_NODE: vty_config_unlock(vty); vty->node = ENABLE_NODE; diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 8c0d0f8628..8ef892555b 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1551,7 +1551,6 @@ static int vtysh_exit(struct vty *vty) case LDP_NODE: case LDP_L2VPN_NODE: case ISIS_NODE: - case MASC_NODE: case RMAP_NODE: case VTY_NODE: case KEYCHAIN_NODE: diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c index 348053c727..e94bd139e5 100644 --- a/vtysh/vtysh_config.c +++ b/vtysh/vtysh_config.c @@ -201,7 +201,7 @@ void vtysh_config_parse_line(void *arg, const char *line) config = config_get(INTERFACE_NODE, line); else if (strncmp(line, "pseudowire", strlen("pseudowire")) == 0) config = config_get(PW_NODE, line); - else if (strncmp(line, "logical-router", strlen("ns")) == 0) + else if (strncmp(line, "logical-router", strlen("logical-router")) == 0) config = config_get(LOGICALROUTER_NODE, line); else if (strncmp(line, "vrf", strlen("vrf")) == 0) config = config_get(VRF_NODE, line); @@ -283,8 +283,6 @@ void vtysh_config_parse_line(void *arg, const char *line) strlen("ip forwarding")) == 0)) config = config_get(FORWARDING_NODE, line); - else if (strncmp(line, "service", strlen("service")) == 0) - config = config_get(SERVICE_NODE, line); else if (strncmp(line, "debug vrf", strlen("debug vrf")) == 0) config = config_get(VRF_DEBUG_NODE, line); else if (strncmp(line, "debug", strlen("debug")) == 0) @@ -328,9 +326,9 @@ void vtysh_config_parse_line(void *arg, const char *line) ((I) == ACCESS_NODE || (I) == PREFIX_NODE || (I) == IP_NODE \ || (I) == AS_LIST_NODE || (I) == COMMUNITY_LIST_NODE \ || (I) == ACCESS_IPV6_NODE || (I) == ACCESS_MAC_NODE \ - || (I) == PREFIX_IPV6_NODE || (I) == SERVICE_NODE \ - || (I) == FORWARDING_NODE || (I) == DEBUG_NODE || (I) == AAA_NODE \ - || (I) == VRF_DEBUG_NODE || (I) == MPLS_NODE) + || (I) == PREFIX_IPV6_NODE || (I) == FORWARDING_NODE \ + || (I) == DEBUG_NODE || (I) == AAA_NODE || (I) == VRF_DEBUG_NODE \ + || (I) == MPLS_NODE) /* Display configuration to file pointer. */ void vtysh_config_dump(FILE *fp) |