mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity
2,649 Commits 149 Branches 59 Tags 37 MiB
integrated
Commit Graph

2649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ondrej Zajicek
e508d166a9 Merge commit 'origin/master' into integrated 2014-05-18 14:53:54 +02:00
Ondrej Zajicek
c8f2f4811d Merge commit '1149aa977d906a6400f998d5f6600871584395d0' into integrated 2014-05-18 14:51:18 +02:00
Ondrej Zajicek
abffa9d421 Update socket code to be synced with master branch. 2014-05-18 11:51:15 +02:00
Ondrej Zajicek
05476c4d04 IPv4/IPv6 integrated socket code. 2014-05-18 11:42:26 +02:00
Ondrej Zajicek
1149aa977d Fixes a problem with undoing of deconfiguring of protocol. 
Thanks to Sergey Popovich for the original patch.
 2014-05-05 11:05:12 +02:00
Ondrej Zajicek
5a3905fe90 Merge commit 'origin/master' 2014-05-04 11:59:50 +02:00
Ondrej Zajicek
66370eac1f Fixes BGP crash when update with some attributes and empty NLRI is received. 
Thanks to Charlie Allom for the bugreport.
 2014-05-04 11:49:41 +02:00
Ondrej Zajicek
7d9ab86b7a Fixes BGP crash when update with some attributes and empty NLRI is received. 2014-05-04 00:01:06 +02:00
Ondrej Zajicek
621782ecee Merge commit 'c865cae3eb327d1e0a745352c483bc7cb00f9323' into integrated 
Conflicts:

	nest/rt-table.c
 2014-05-02 20:23:38 +02:00
Ondrej Zajicek
121fd43d91 Merge commit '145368f5474436ad7c48fa26f5bde8108ae5ef4a' into integrated 
Conflicts:

	proto/ospf/rt.c
 2014-05-02 20:14:43 +02:00
Ondrej Zajicek
cd50872c3b Merge commit '4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6' into integrated 2014-05-02 18:28:33 +02:00
Ondrej Zajicek
3f6bfbbf1c Merge commit '538fec7b1b7dd729eadf1c933e27f59080cd3576' into integrated 2014-05-02 18:27:40 +02:00
Ondrej Zajicek
6a996cb921 Merge commit 'dad92c30c7892457335d52a09548330498567ea8' into integrated 2014-05-02 18:26:00 +02:00
Ondrej Zajicek
36a16cc8b9 Merge commit 'c980f8002e0f0578d5e715d48d65d9fb9a0c5a70' into integrated 
Conflicts:

	sysdep/unix/krt.h
 2014-05-02 18:25:41 +02:00
Ondrej Zajicek
c8655cd966 Merge commit '2e84b4e82dbf8fce0fd12fb0c25d925ffd287970' into integrated 2014-05-02 18:14:15 +02:00
Ondrej Zajicek
6c58962611 Merge commit 'd40c26594c22ad934a13061e11b373bdf81af8f9' into integrated 
Conflicts:

	proto/static/static.c
 2014-05-02 18:13:20 +02:00
Ondrej Zajicek
c0821881fe Merge commit '3216eb03ddddc057bb18fa4dd02b7935a604f71f' into integrated 
Conflicts:

	sysdep/linux/netlink.c
 2014-05-02 18:05:57 +02:00
Ondrej Zajicek
9dd29a1337 Merge commit 'd776540811cdf672dc113f29feef2415465589c6' into integrated 2014-05-02 17:42:20 +02:00
Ondrej Zajicek
2077201920 Merge commit '5c200e0a4d26d183e04fda43de16340521002c40' into integrated 
Conflicts:

	lib/ipv4.h
	lib/ipv6.h
 2014-05-02 17:41:45 +02:00
Ondrej Zajicek
8d9c5b8c3a Merge commit '4a5eb284c9d51441e09976021d1bd93c21408d46' into integrated 2014-05-02 17:18:45 +02:00
Ondrej Zajicek
7b9bfcbc4a Merge commit '10c2e1e0125dfa600b1c2b6553883cccf2d025dd' into integrated 2014-05-02 17:18:36 +02:00
Ondrej Zajicek
0d272860a3 Merge commit 'cba9cbf1bdb253c7727da10ff4f835d7ffbadeed' into integrated 2014-05-02 17:15:25 +02:00
Ondrej Zajicek
c93f50635c Merge commit '48e5f32db676645640f84ab3d630cce975aa6b20' into integrated 2014-05-02 17:05:23 +02:00
Ondrej Zajicek
a485fd2909 Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated 
Conflicts:

	nest/rt-table.c
	proto/bgp/attrs.c
	proto/bgp/packets.c
	proto/ospf/ospf.c
	proto/rip/rip.c
	proto/static/static.c
	sysdep/unix/krt.c
 2014-04-29 17:23:38 +02:00
Ondrej Zajicek
91ea1b134b Merge commit '300e4008f02382b87409dabb52a317b8336de55b' into integrated 
Conflicts:

	nest/neighbor.c
 2014-04-29 16:40:23 +02:00
Ondrej Zajicek
37c2153457 Merge commit '0bb4e37db317a1290bad24fe430cac6569a9bd8c' into integrated 
Conflicts:

	sysdep/linux/netlink.c
 2014-04-29 16:32:08 +02:00
Ondrej Zajicek
b1c680a680 Merge commit '2b3d52aa421ae1c31e30107beefd82fddbb42854' into integrated 2014-04-29 16:25:09 +02:00
Ondrej Zajicek
f353a1b09e Merge commit '1fba34a7a1e245f08212a31a65030230da8c451d' into integrated 2014-04-29 16:24:59 +02:00
Ondrej Zajicek
f47914c8a8 Merge commit '0aeac9cb7f9887374ce0258c8653f9518529bf08' into integrated 
Conflicts:

	configure.in
	lib/printf.c
	proto/ospf/config.Y
	proto/ospf/hello.c
	proto/ospf/iface.c
	proto/ospf/ospf.h
 2014-04-29 16:17:09 +02:00
Ondrej Zajicek
51e37fbb40 Merge commit '8931425d02dd8656b48142f608d3119ab6f4a96f' into integrated 
Conflicts:

	nest/rt-table.c
 2014-04-29 16:05:47 +02:00
Ondrej Zajicek
054bc43a5c Merge commit '64534ea2f4361c247d7a0d1b6b14a02e8e3d6d33' into integrated 
Conflicts:

	sysdep/bsd/krt-sock.c
 2014-04-29 15:31:46 +02:00
Ondrej Zajicek
52ceae6144 Merge commit 'f8f2419d4c5b9028b9b3d2d893fe802f18eb239b' into integrated 2014-04-29 15:24:07 +02:00
Ondrej Zajicek
1002f891d8 Merge commit '33be3ba713901befe2df651b869a406df8fc8ace' into integrated 2014-04-29 15:21:36 +02:00
Ondrej Zajicek
44c8edf53e Merge commit 'a15dab76f93337b07b4b03a64ac3bac26285dfd9' into integrated 2014-04-29 15:20:18 +02:00
Ondrej Zajicek
1a74af87ef Merge commit 'f8cc7396cf25328b002394bbd7af679188b03370' into integrated 2014-04-29 15:19:05 +02:00
Ondrej Zajicek
455539ba1b Merge commit 'e7c2380260f20a4a3587b47df97879ef91c69774' into integrated 2014-04-29 15:16:32 +02:00
Ondrej Zajicek
44f9cca21d Merge commit 'a5fc59587fe864e4fcfb44eb3be57231b4ca339b' into integrated 
Conflicts:

	filter/filter.c
	nest/config.Y
 2014-04-29 15:15:35 +02:00
Ondrej Zajicek
6310da3509 Merge commit 'f83ce94d5e410d5e5b921121867321c19451896b' into integrated 2014-04-29 15:10:51 +02:00
Ondrej Zajicek
7b8adb3cb7 Merge commit 'f515e22924591542a909db0deb8545386aaa576e' into integrated 
Conflicts:

	sysdep/bsd/krt-sock.c
 2014-04-29 15:07:08 +02:00
Ondrej Zajicek
8f4159a911 Merge commit 'e550a37206528be39e4751865b46720885fd64ed' into integrated 2014-04-29 13:52:01 +02:00
Ondrej Zajicek
7e2b6eaf43 Merge commit 'c404f4b968b69a2c5c1975d04abf7474891d5656' into integrated 2014-04-29 13:11:02 +02:00
Ondrej Zajicek
2187708520 Merge commit '6a8d3f1c1ffbd964e4d11b452c73e1ea70310af3' into integrated 
Conflicts:

	configure.in
	lib/socket.h
	nest/protocol.h
 2014-04-29 13:00:14 +02:00
Ondrej Zajicek
411e8b1de2 Merge commit '92f8878cbf5d8ad9e9b909a9dcbb2112de54a542' into integrated 2014-04-29 12:52:39 +02:00
Ondrej Zajicek
abb93d9846 Merge commit '2a0130f94d2304e316f0ffad8e52fce094559782' into integrated 2014-04-29 12:52:34 +02:00
Ondrej Zajicek
c15a446634 Merge commit '507e182a60c3704f8a28a0450f1affc2c7c1b66a' into integrated 2014-04-29 12:46:59 +02:00
Ondrej Zajicek
5d43c86fc3 Merge commit 'b0a8c7fc8547eef21ede33887580b5e867ee742c' into integrated 2014-04-29 12:44:08 +02:00
Ondrej Zajicek
50d53854f5 Merge commit 'bff9ce5130d16af2fd802d42bdb2bff00980c9ae' into integrated 
Conflicts:

	tools/Makefile.in
 2014-04-29 12:43:25 +02:00
Ondrej Zajicek
b1a2d4427c Merge commit '1f64a487a065cc27c52ab0d3d38b7c82926fea70' into integrated 2014-04-29 12:41:40 +02:00
Ondrej Zajicek
e1242dccaa Merge commit 'b21955e05800c3ceedfe39eef605da84285296c7' into integrated 2014-04-29 12:41:18 +02:00
Ondrej Zajicek
94acc8975c Merge commit '00192d5ab88ff9eeccbc1bc10cb534976a56963d' into integrated 2014-04-29 12:40:54 +02:00