1
0
Fork 0
mirror of https://gitlab.com/netravnen/NetworkLabNotes.git synced 2024-11-23 19:17:54 +00:00

Merge branch '21-fix-table-2-spanning-tree-standards' into 'master'

Resolve "Fix Table 2: Spanning tree standards"

Closes #21

See merge request netravnen/CiscoLabNotes!12
This commit is contained in:
netravnen 2017-09-15 08:54:28 +00:00
commit d718c178db
4 changed files with 14 additions and 9 deletions

View file

@ -7,12 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased] ## [Unreleased]
- See commit changelog - See commit changelog
## [0.3.3] - 2017-09-15
### Fix
- Table 2: Spanning Tree standards
## [0.3.2] - 2017-09-10 ## [0.3.2] - 2017-09-10
## Added ### Added
- Initial BGP content considered done. - Initial BGP content considered done.
## [0.3.1] - 2017-07-19 ## [0.3.1] - 2017-07-19
## Removed ### Removed
- Removed supervisor from front-page - Removed supervisor from front-page
## [0.3.0] - 2017-06-06 ## [0.3.0] - 2017-06-06

View file

@ -1,6 +1,6 @@
[![GitHub tag](https://img.shields.io/github/tag/netravnen/CiscoLabNotes.svg)](https://gitlab.com/netravnen/CiscoLabNotes) [![GitHub tag](https://img.shields.io/github/tag/netravnen/CiscoLabNotes.svg)](https://gitlab.com/netravnen/CiscoLabNotes)
[![license](https://img.shields.io/github/license/netravnen/CiscoLabNotes.svg)](https://gitlab.com/netravnen/CiscoLabNotes/blob/master/LICENSE.md) [![license](https://img.shields.io/github/license/netravnen/CiscoLabNotes.svg)](https://gitlab.com/netravnen/CiscoLabNotes/blob/master/LICENSE.md)
[![GitHub commits](https://img.shields.io/github/commits-since/netravnen/CiscoLabNotes/v0.3.2.svg)](https://gitlab.com/netravnen/CiscoLabNotes/compare/v0.3.2...HEAD) [![GitHub commits](https://img.shields.io/github/commits-since/netravnen/CiscoLabNotes/v0.3.3.svg)](https://gitlab.com/netravnen/CiscoLabNotes/compare/v0.3.3...HEAD)
# URLs # URLs
- [Gitlab][repo-origin] **working** dir - [Gitlab][repo-origin] **working** dir

View file

@ -193,10 +193,11 @@ STP comes from the above desire where redundancy was wanted but no protocol exis
\begin{tabular}{|l|l|l|l|l|} \begin{tabular}{|l|l|l|l|l|}
\hline \hline
\textbf{} & \textbf{Standard} & \textbf{Ressource Usage} & \multicolumn{2}{l|}{\textbf{Convergence}} \\ \hline \textbf{} & \textbf{Standard} & \textbf{Ressource Usage} & \multicolumn{2}{l|}{\textbf{Convergence}} \\ \hline
\gls{cst} & 802.1D & Low & Slow & All vlans \\ \hline \gls{cst} & 802.1Q & Low & Slow & All Vlans \\ \hline
\gls{pvst+} & Cisco & High & Slow & Per vlan \\ \hline \gls{stp} & 802.1D & - & - & All Vlans \\ \hline
\gls{rstp} & 802.1w & So-so (Med.) & Fast & All vlans \\ \hline \gls{pvst+} & Cisco & High & Slow & Per Vlan \\ \hline
\gls{rpvst+} & Cisco & On-the-double (V.High) & Fast & Per vlan \\ \hline \gls{rstp} & 802.1w & So-so (Med.) & Fast & All Vlans \\ \hline
\gls{rpvst+} & Cisco & On-the-double (V.High) & Fast & Per Vlan \\ \hline
\gls{mst} & 802.1s & Med. - High & Fast & Vlan list \\ \hline \gls{mst} & 802.1s & Med. - High & Fast & Vlan list \\ \hline
\end{tabular}% \end{tabular}%
} }

View file

@ -3,10 +3,10 @@
\title{Networking with switches and routers, automation and IPv4/6} \title{Networking with switches and routers, automation and IPv4/6}
\def\thesubject{My Notes going along with learning Cisco Networking} \def\thesubject{My Notes going along with learning Cisco Networking}
\author{Netravnen <netravnen@gmail.com>\\ \author{"Netravnen (Gmail) (netravnen@gmail.com)" <netravnen@gmail.com>\\
Fingerprint: C8B3 82A8 A1CD CDB7 71FE B24C C654 948F DA86 BECD} Fingerprint: C8B3 82A8 A1CD CDB7 71FE B24C C654 948F DA86 BECD}
\def\theversion{v0.3.2} \def\theversion{v0.3.3}
\date{{\footnotesize Last release \theversion\\% \date{{\footnotesize Last release \theversion\\%
\texttt{\color{Gray}Generated \utccurrenttime}}} \texttt{\color{Gray}Generated \utccurrenttime}}}