Skip to content
avnshs edited this page Mar 24, 2012 · 7 revisions

Branches

  • master or quagga

    This branch represents the quagga mainline (branch master on git://git.sv.gnu.org/quagga.git).

  • google-bgp-multipath

    The bgp-multipath branch from https://code.google.com/p/google-quagga/, brought up to date with respect to quagga.

  • google-is-is

    The is-is branch from https://code.google.com/p/google-quagga/, brought up to date with respect to quagga.

  • quagga-osr

    Patches to quagga by OSR, which are being fed back upstream individually.

  • osr

    The merged result of all the branches above.

  • osr-integ

    Branch that contains everything that is in osr, except patches from OSR that are being fed back to the relevant upstream branch (e.g., quagga-osr). The osr-integ branch could potentially yield cleaner git history than the osr branch, we'll see...

Clone this wiki locally