]> git.proxmox.com Git - mirror_frr.git/history - isisd/isis_main.c
Merge branch 'stable/3.0' into tmp-3.0-master-merge
[mirror_frr.git] / isisd / isis_main.c
2017-08-09 David LamparterMerge branch 'stable/3.0' into tmp-3.0-master-merge
2017-08-09 David LamparterMerge commit '78986c0' into tmp-3.0-master-merge
2017-08-09 whitespace / reindent*: reindent reindent-3.0-after
2017-08-04 Donald SharpMerge pull request #867 from jbonor/fixes
2017-08-04 David LamparterMerge pull request #891 from Jafaral/portability
2017-08-04 David LamparterMerge pull request #900 from qlyoung/apply-mask
2017-08-04 David LamparterMerge pull request #870 from chiragshah6/mdev
2017-08-03 Jafar Al-GharaibehMerge pull request #897 from donaldsharp/pim_memory_leak
2017-08-03 Donald SharpMerge pull request #854 from opensourcerouting/isis...
2017-08-03 Christian Frankeisisd: send/receive LSPs with new parser
2017-07-18 Quentin YoungMerge pull request #805 from Orange-OpenSource/master
2017-07-17 tmartiromerge with upstream
2017-07-17 whitespace / reindent*: reindent reindent-master-after
2017-07-14 Donald SharpMerge pull request #762 from bingen/mutiple_nh_recursiv...
2017-07-10 David LamparterMerge commit '3d22338f04d9554fa' into evpn-prep
2017-07-07 Martin WinterMerge pull request #750 from donaldsharp/bgp_buffer
2017-06-30 Daniel WaltonMerge branch 'master' of https://github.com/dwalton76...
2017-06-30 Jafar Al-GharaibehMerge pull request #740 from donaldsharp/ospf_commands
2017-06-30 Jafar Al-GharaibehMerge pull request #768 from qlyoung/fix-gitignore2
2017-06-30 Jafar Al-GharaibehMerge pull request #770 from donaldsharp/zclient
2017-06-30 Donald Sharpisisd: Fix zclient cleanup on shutdown
2017-06-29 Donald SharpMerge remote-tracking branch 'origin/stable/3.0'
2017-06-28 Donald SharpMerge remote-tracking branch 'origin/stable/2.0'
2017-06-13 David LamparterMerge branch 'stable/3.0'
2017-06-06 David LamparterMerge branch 'stable/3.0'
2017-06-05 Donald SharpMerge remote-tracking branch 'origin/stable/2.0'
2017-05-30 Donald SharpMerge remote-tracking branch 'origin/master' into babel
2017-05-30 David LamparterMerge pull request #563 from qlyoung/enforce-no-pthread...
2017-05-24 Donald SharpMerge remote-tracking branch 'origin/stable/3.0'
2017-05-19 Donald SharpMerge remote-tracking branch 'origin/stable/3.0'
2017-05-19 Donald SharpMerge remote-tracking branch 'origin/stable/3.0'
2017-05-18 David LamparterMerge branch 'stable/3.0'
2017-05-18 David LamparterMerge branch 'frr/pull/569'
2017-05-18 David LamparterMerge branch 'frr/pull/567'
2017-05-18 David LamparterMerge branch 'frr/pull/550'
2017-05-18 David LamparterMerge branch 'stable/3.0'
2017-05-18 David LamparterMerge branch stable/2.0 into stable/3.0
2017-05-18 David LamparterMerge branch 'frr/pull/546' ("bgpd: resolve issue with...
2017-05-18 David LamparterMerge branch 'frr/pull/536'
2017-05-17 David LamparterMerge pull request #537 from donaldsharp/vrf_stuff
2017-05-17 Renato WestphalMerge pull request #561 from donaldsharp/static_config2
2017-05-17 Donald SharpMerge remote-tracking branch 'origin/stable/3.0'
2017-05-17 Donald SharpMerge remote-tracking branch 'origin/stable/2.0'
2017-05-17 Lou BergerMerge pull request #538 from qlyoung/fix-stack-access-2
2017-05-17 David LamparterMerge pull request #549 from qlyoung/fix-poll-eof
2017-05-16 Donald SharpMerge pull request #532 from opensourcerouting/gpl...
2017-05-16 Donald SharpMerge branch 'master' into vrf_stuff
2017-05-15 Donald Sharp*: Consolidate vrf_hooks into vrf_init
2017-05-15 David Lamparter*: make consistent & update GPLv2 file headers
2017-05-02 Donald SharpMerge remote-tracking branch 'origin/stable/2.0'
2017-05-02 Martin WinterMerge pull request #410 from dslicenc/rdnbrd-vrr
2017-04-27 Donald SharpMerge remote-tracking branch 'origin/stable/2.0'
2017-04-04 David LamparterMerge branch 'stable/2.0'
2017-03-17 Donald SharpMerge remote-tracking branch 'origin/master' into EIGRP
2017-03-10 David LamparterMerge branch 'stable/2.0'
2017-03-09 Donald SharpMerge pull request #263 from opensourcerouting/assorted...
2017-03-08 David Lamparterisisd: remove reload-by-reexec
2017-03-08 Jafar Al-GharaibehMerge pull request #262 from donaldsharp/pim_jp_fixes frr-3.0-branchpoint
2017-03-08 Donald SharpMerge pull request #261 from opensourcerouting/lib_cleanup
2017-03-07 David Lamparterlib: remove remaining struct zlog * args
2017-03-07 David Lamparter*: add frr_run()
2017-03-07 David Lamparter*: add frr_config_fork()
2017-03-07 David Lamparter*: centralize more into frr_init()
2017-03-07 David Lamparter*: add frr_init() infrastructure
2017-02-14 David LamparterMerge pull request #149 from pguibert6WIND/frr_6wind_st...
2017-02-07 David LamparterMerge branch 'frr/pull/152' ("Lib fixes")
2017-02-02 Donald SharpMerge remote-tracking branch 'origin/stable/2.0'
2017-02-02 Donald SharpMerge pull request #143 from LabNConsulting/working...
2017-02-01 Donald SharpMerge pull request #146 from opensourcerouting/assorted...
2017-02-01 David Lamparter*: fix warning fallout from set_socket_path
2017-01-25 Russ WhiteMerge pull request #120 from opensourcerouting/snapcraf...
2017-01-25 Martin Winterisisd: Add vty_socket cli option to override the compil...
2017-01-18 Donald SharpMerge remote-tracking branch 'origin/master' into pim_l...
2017-01-09 Olivier DugeonMerge pull request #55 from donaldsharp/monotonic
2017-01-07 Quentin YoungMerge branch 'master' into fix-proto_redistnum
2017-01-07 Donald SharpMerge pull request #35 from qlyoung/fix-zebra-rf
2017-01-07 Donald SharpMerge pull request #32 from qlyoung/fix-cli-nits2
2017-01-07 Donald SharpMerge pull request #30 from qlyoung/fix-cli-nits
2017-01-07 Donald SharpMerge pull request #27 from qlyoung/fix-derefs2
2017-01-07 Donald SharpMerge pull request #24 from qlyoung/fix-uninitialized...
2017-01-06 Donald SharpMerge pull request #40 from opensourcerouting/ldpd...
2017-01-06 Donald SharpMerge pull request #39 from opensourcerouting/renato...
2017-01-06 Donald SharpMerge pull request #49 from pguibert6WIND/frr_6wind_mpb...
2017-01-06 Donald SharpMerge remote-tracking branch 'origin/stable/2.0'
2017-01-03 David LamparterMerge pull request #37 from LabNConsulting/working...
2017-01-03 Donald SharpMerge pull request #28 from opensourcerouting/dev/osr...
2016-12-20 David Lamparterbuild: rename (1 of ?): configure.ac + preproc
2016-12-08 David LamparterMerge branch '-isisd-simpl' into stable/2.0
2016-12-05 David LamparterMerge branch '-rip' into stable/2.0
2016-12-05 David LamparterMerge branch '-renato' into stable/2.0
2016-12-02 Quentin YoungMerge remote-tracking branch 'osr_private_quagga/queue...
2016-11-28 David LamparterMerge commit '34d5ef459140ee7e'
2016-11-28 David LamparterMerge branch 'vtysh-grammar'
2016-11-28 David LamparterMerge remote-tracking branch 'cmaster-next' into cmaste...
2016-11-19 Donald SharpMerge remote-tracking branch 'origin/cmaster' into...
2016-11-19 David LamparterMerge remote-tracking branch 'cmaster-next' into cmaste...
2016-11-14 David Lamparter*: fix some licensing SNAFUs
2016-11-10 Donald SharpMerge remote-tracking branch 'origin/cmaster' into...
2016-10-21 Donald SharpMerge remote-tracking branch 'origin/cmaster' into...
2016-10-17 Quentin YoungMerge branch 'cmaster-next' into vtysh-grammar
next