summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | zebra: remove invalid ref "frr-configuration"Quentin Young2018-08-311-2/+0
| * | | | | | doc: update subdir.amQuentin Young2018-08-311-17/+17
| * | | | | | doc: update misc build docsQuentin Young2018-08-314-198/+274
| * | | | | | doc: name correct sphinx package under FreeBSD 11Quentin Young2018-08-311-1/+1
| * | | | | | doc: rename building_frr_on* -> building_frr_for*Quentin Young2018-08-3117-0/+0
* | | | | | | Merge pull request #2945 from dslicenc/bgp-ospf-jsonDavid Lamparter2018-09-0134-324/+466
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | bgpd: convert from conditional operator to if-then for json changesDon Slice2018-08-311-19/+31
| * | | | | | bgpd: change conditional operators for bgp/ospf json changesDon Slice2018-08-311-21/+18
| * | | | | | ospfd: fix more warnings with the bgp ospf json commitDon Slice2018-08-301-0/+5
| * | | | | | bgpd/ospfd: resolve warnings for bgp/ospf json commitDon Slice2018-08-307-33/+42
| * | | | | | bgpd/ospfd: make bgp and ospf json response a bit more consistentDon Slice2018-08-3034-325/+444
* | | | | | | Merge pull request #2913 from opensourcerouting/non-recursive-prepQuentin Young2018-08-3127-859/+996
|\ \ \ \ \ \ \
| * | | | | | | doc: drop colspan/rowspan elementsDavid Lamparter2018-08-302-54/+62
| * | | | | | | doc: html default offDavid Lamparter2018-08-301-2/+2
| * | | | | | | build: add Makefile variable easy accessDavid Lamparter2018-08-301-0/+14
| * | | | | | | build: improve python search patternDavid Lamparter2018-08-301-35/+55
| * | | | | | | build: add warning when overwriting vars on "make"David Lamparter2018-08-302-1/+45
| * | | | | | | build: cache a few more results in ./configureDavid Lamparter2018-08-301-29/+41
| * | | | | | | build: -Werror does not belong in AM_CPPFLAGSDavid Lamparter2018-08-301-2/+2
| * | | | | | | build: non-recursive solarisDavid Lamparter2018-08-305-34/+119
| * | | | | | | build: fix some oddities in solaris/David Lamparter2018-08-302-9/+8
| * | | | | | | build: trigger fewer unneccessary clippy rebuildsDavid Lamparter2018-08-301-1/+1
| * | | | | | | build: non-recursive debianpkgDavid Lamparter2018-08-304-49/+73
| * | | | | | | build: non-recursive doc + parallel sphinxDavid Lamparter2018-08-3017-650/+581
* | | | | | | | Merge pull request #2955 from ton31337/feature/nexthop_blackholeDavid Lamparter2018-08-311-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | plist: Add safety check to avoid going over 4294967295 for prefix-listDonatas Abraitis2018-08-311-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2940 from ton31337/fix/as-path_validationDavid Lamparter2018-08-311-21/+40
|\ \ \ \ \ \ \ \
| * | | | | | | | bgpd: Validate as-path access-list before continuing regarding invalid charsDonatas Abraitis2018-08-311-21/+40
| |/ / / / / / /
* | | | | | | | Merge pull request #2785 from donaldsharp/AGGanomicsLou Berger2018-08-3133-720/+964
|\ \ \ \ \ \ \ \
| * | | | | | | | lib: Move aggregate pointer into aggregate route/tableDonald Sharp2018-08-302-3/+2
| * | | | | | | | bgpd, ripngd: Convert to using new agg_table/routeDonald Sharp2018-08-3029-717/+750
| * | | | | | | | lib: Add Aggregate Table and Aggregate_nodeDonald Sharp2018-08-303-0/+212
* | | | | | | | | Merge pull request #2951 from qlyoung/sort-route-mapsDavid Lamparter2018-08-311-2/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | lib: sort route-maps for displayQuentin Young2018-08-301-2/+20
| |/ / / / / / / /
* | | | | | | | | static: Put vty_frame around vrf output in staticd.Donald Sharp2018-08-311-0/+6
* | | | | | | | | staticd: Fix mixup in vrf translationsDonald Sharp2018-08-312-33/+55
* | | | | | | | | vtysh: Let staticd know about vrf sub-modeDonald Sharp2018-08-311-1/+1
* | | | | | | | | Merge pull request #2923 from pguibert6WIND/fix_veth_namespaceDavid Lamparter2018-08-313-6/+20
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | zebra: do not update link if interface is veth interfacePhilippe Guibert2018-08-293-1/+13
| * | | | | | | | zebra: when veth link is used across vrf, the link may not be goodPhilippe Guibert2018-08-273-5/+7
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #2947 from mjstapp/fix_os_nameQuentin Young2018-08-301-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | lib: fix use of frrpthread os_nameMark Stapp2018-08-301-1/+1
* | | | | | | | | configure: Update version to 6.1-devfrr-6.1-devMartin Winter2018-08-301-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #2859 from LabNConsulting/working/master/meminfoDavid Lamparter2018-08-303-8/+46
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | lib: atomic_add_fetch_explicit not supported on all platformsLou Berger2018-08-291-4/+4
| * | | | | | | lib: qmem show changes (header and max)Lou Berger2018-08-293-8/+46
* | | | | | | | Merge pull request #2942 from mjstapp/fix_new_atomicsDavid Lamparter2018-08-301-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | libs: fix missing atomics for some gcc versionsMark Stapp2018-08-291-0/+6
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2754 from chiragshah6/mdev1David Lamparter2018-08-305-19/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | *: pthread set name abstractionChirag Shah2018-08-305-19/+50
|/ / / / / / / /