Skip to content

sync back from beta_21_staging #1685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MelvinTo merged 270 commits into from
Dec 25, 2025
Merged

sync back from beta_21_staging #1685

Changes from all commits
Commits
Show all changes
270 commits
Select commit Hold shift + click to select a range
eb13b38
round robin between learnt and original endpoint in WireguardMeshAuto…
jasonlyc Apr 4, 2023
5b5d8c3
Merge pull request #991 from firewalla/beta_8_staging
MelvinTo Apr 6, 2023
9f8be5b
Merge pull request #993 from firewalla/beta_8_0
MelvinTo Apr 6, 2023
aed9131
Merge pull request #998 from firewalla/beta_8_staging
MelvinTo Apr 13, 2023
32a71dc
Merge pull request #999 from firewalla/beta_8_0
MelvinTo Apr 13, 2023
c6c4637
Merge pull request #1008 from firewalla/beta_13_staging
MelvinTo Apr 25, 2023
6160c60
Merge pull request #1021 from firewalla/master
MelvinTo May 30, 2023
6100944
Merge pull request #1022 from firewalla/master
MelvinTo May 30, 2023
b7c81cc
Merge pull request #1025 from firewalla/master
MelvinTo May 31, 2023
b88de70
Merge pull request #1030 from firewalla/master
MelvinTo Jun 5, 2023
476f87c
Merge pull request #1031 from firewalla/master
MelvinTo Jun 5, 2023
839e2ea
Merge pull request #1032 from firewalla/master
MelvinTo Jun 5, 2023
8192689
Merge pull request #1038 from firewalla/master
MelvinTo Jun 8, 2023
07e0731
Merge pull request #1039 from firewalla/master
MelvinTo Jun 8, 2023
bbc6b74
Merge pull request #1040 from firewalla/master
MelvinTo Jun 8, 2023
77d26a9
adds new dhcp-hostsdir
drahnieR Jun 29, 2023
66d72be
adds new dhcp-hostsdir
drahnieR Jun 29, 2023
490c6af
Merge branch 'beta_15_staging' of https://github.com/firewalla/firero…
jasonlyc Jun 29, 2023
5a41c65
adds new dhcp-hostsdir
drahnieR Jun 29, 2023
6496910
Merge pull request #1053 from jasonlyc/beta_15_staging
MelvinTo Jun 29, 2023
20a53b7
Merge pull request #1054 from jasonlyc/beta_17_staging
MelvinTo Jun 29, 2023
d930ab8
Merge pull request #1055 from jasonlyc/beta_13_staging
MelvinTo Jun 29, 2023
de6a99d
Merge pull request #1060 from firewalla/master
jasonlyc Jul 10, 2023
9b4a55e
Merge pull request #1061 from firewalla/master
jasonlyc Jul 10, 2023
2dd10cd
Merge pull request #1062 from firewalla/master
jasonlyc Jul 10, 2023
c88d22f
Merge pull request #1066 from firewalla/master
MelvinTo Jul 17, 2023
66a35a1
Merge pull request #1067 from firewalla/master
MelvinTo Jul 17, 2023
a7c6f68
Merge pull request #1068 from firewalla/master
MelvinTo Jul 17, 2023
4c44774
Merge pull request #1069 from firewalla/beta_8_staging
MelvinTo Jul 18, 2023
2be9634
Merge pull request #1070 from firewalla/beta_8_0
MelvinTo Jul 18, 2023
506b206
Merge pull request #1073 from firewalla/master
MelvinTo Jul 21, 2023
b017ae4
Merge pull request #1074 from firewalla/master
MelvinTo Jul 21, 2023
e9cc918
Merge pull request #1075 from firewalla/master
MelvinTo Jul 21, 2023
af97617
Merge pull request #1080 from firewalla/beta_8_staging
MelvinTo Jul 27, 2023
bef948f
Merge pull request #1081 from firewalla/beta_8_0
MelvinTo Jul 27, 2023
abef5fc
Merge pull request #1096 from firewalla/master
MelvinTo Sep 6, 2023
d5a5784
Merge pull request #1098 from firewalla/master
MelvinTo Sep 11, 2023
7cbc47a
Merge pull request #1104 from firewalla/beta_8_staging
MelvinTo Sep 15, 2023
fa209fb
Merge pull request #1105 from firewalla/beta_8_staging
MelvinTo Sep 15, 2023
b2e7b21
Merge pull request #1106 from firewalla/beta_8_staging
MelvinTo Sep 15, 2023
03d1b4f
Merge pull request #1108 from firewalla/master
MelvinTo Sep 19, 2023
a3ca39c
Merge pull request #1111 from firewalla/master
MelvinTo Sep 20, 2023
7bd05ae
Merge pull request #1114 from firewalla/master
MelvinTo Sep 22, 2023
546de06
Merge pull request #1115 from firewalla/beta_8_staging
MelvinTo Sep 25, 2023
9aa91fa
Merge pull request #1117 from firewalla/beta_8_0
MelvinTo Sep 25, 2023
271b13f
Merge pull request #1118 from firewalla/master
MelvinTo Sep 25, 2023
47595fb
Merge pull request #1121 from firewalla/master
MelvinTo Sep 26, 2023
9dbcc38
Merge pull request #1127 from firewalla/master
MelvinTo Oct 13, 2023
2d6a787
Merge pull request #1128 from firewalla/master
MelvinTo Oct 13, 2023
c4de64a
Merge pull request #1129 from firewalla/master
MelvinTo Oct 13, 2023
6d35a3a
Merge pull request #1136 from firewalla/master
MelvinTo Nov 14, 2023
4737efb
Merge pull request #1137 from firewalla/master
MelvinTo Nov 14, 2023
ad4beb8
Merge pull request #1138 from firewalla/master
MelvinTo Nov 14, 2023
2fe7821
Merge pull request #1141 from firewalla/master
MelvinTo Nov 17, 2023
d611cb9
Merge pull request #1142 from firewalla/master
MelvinTo Nov 17, 2023
f662757
Merge pull request #1143 from firewalla/master
MelvinTo Nov 17, 2023
7e3dd75
Merge pull request #1148 from firewalla/beta_8_staging
MelvinTo Nov 30, 2023
58e5f15
Merge pull request #1149 from firewalla/beta_8_staging
MelvinTo Nov 30, 2023
685f5bc
Merge pull request #1150 from firewalla/beta_8_staging
MelvinTo Nov 30, 2023
10b7254
Merge pull request #1153 from firewalla/beta_8_staging
MelvinTo Dec 2, 2023
1f1c988
Merge pull request #1154 from firewalla/beta_8_staging
MelvinTo Dec 2, 2023
c679a84
Merge pull request #1155 from firewalla/beta_8_staging
MelvinTo Dec 2, 2023
acb52f5
Merge pull request #1164 from firewalla/beta_8_staging
MelvinTo Dec 7, 2023
1007276
Merge pull request #1163 from firewalla/beta_8_staging
MelvinTo Dec 7, 2023
766c69c
Merge pull request #1162 from firewalla/beta_8_staging
MelvinTo Dec 7, 2023
63c4e40
Merge pull request #1165 from firewalla/beta_8_staging
MelvinTo Dec 11, 2023
962b65b
Merge pull request #1166 from firewalla/beta_8_0
MelvinTo Dec 11, 2023
0067776
Merge pull request #1170 from firewalla/beta_8_staging
MelvinTo Dec 14, 2023
557f69a
Merge pull request #1171 from firewalla/beta_8_staging
MelvinTo Dec 14, 2023
f05217f
Merge pull request #1172 from firewalla/beta_8_staging
MelvinTo Dec 14, 2023
a6d43ad
Merge pull request #1177 from firewalla/beta_8_staging
MelvinTo Dec 26, 2023
4cc8d71
Merge pull request #1178 from firewalla/beta_8_staging
MelvinTo Dec 26, 2023
a14d639
Merge pull request #1179 from firewalla/beta_8_staging
MelvinTo Dec 26, 2023
f8d23ba
Merge pull request #1184 from firewalla/beta_8_staging
MelvinTo Dec 27, 2023
89c663b
Merge pull request #1185 from firewalla/beta_8_staging
MelvinTo Dec 27, 2023
ee64736
Merge pull request #1186 from firewalla/beta_8_staging
MelvinTo Dec 27, 2023
2c014e7
Merge pull request #1189 from firewalla/beta_8_staging
MelvinTo Dec 28, 2023
372fa1a
Merge pull request #1190 from firewalla/beta_8_staging
MelvinTo Dec 28, 2023
4a9a11b
Merge pull request #1191 from firewalla/beta_8_staging
MelvinTo Dec 28, 2023
9a4159f
Merge pull request #1193 from firewalla/beta_8_staging
MelvinTo Dec 28, 2023
267a9b6
Merge pull request #1194 from firewalla/beta_8_staging
MelvinTo Dec 28, 2023
7c1d6c5
Merge pull request #1195 from firewalla/beta_8_staging
MelvinTo Dec 28, 2023
3456207
Merge pull request #1196 from firewalla/beta_8_staging
MelvinTo Jan 2, 2024
68127ea
Merge pull request #1197 from firewalla/beta_8_0
MelvinTo Jan 2, 2024
f06028e
Merge pull request #1223 from firewalla/beta_8_staging
MelvinTo Mar 18, 2024
eb8bfc6
Merge pull request #1224 from firewalla/beta_8_staging
MelvinTo Mar 18, 2024
28df8c3
Merge pull request #1225 from firewalla/beta_8_staging
MelvinTo Mar 18, 2024
add03f6
Merge pull request #1234 from firewalla/master
MelvinTo Mar 29, 2024
0f3d301
Merge pull request #1237 from firewalla/beta_8_staging
MelvinTo Apr 1, 2024
eaae8ea
Merge pull request #1236 from firewalla/beta_8_staging
MelvinTo Apr 1, 2024
8c278f0
Merge pull request #1235 from firewalla/beta_8_staging
MelvinTo Apr 1, 2024
cf76990
Merge pull request #1240 from firewalla/master
MelvinTo Apr 3, 2024
a8a2dc3
Merge pull request #1243 from firewalla/beta_8_staging
MelvinTo Apr 3, 2024
6c8e1ec
Merge pull request #1242 from firewalla/beta_8_staging
MelvinTo Apr 3, 2024
ff13aeb
Merge pull request #1241 from firewalla/beta_8_staging
MelvinTo Apr 3, 2024
a242913
Merge pull request #1246 from firewalla/master
MelvinTo Apr 25, 2024
902e625
Merge pull request #1247 from firewalla/beta_8_staging
MelvinTo Apr 25, 2024
256badb
Merge pull request #1248 from firewalla/beta_8_staging
MelvinTo Apr 25, 2024
15cb519
Merge pull request #1249 from firewalla/beta_8_staging
MelvinTo Apr 25, 2024
dc1100c
Merge pull request #1262 from firewalla/master
MelvinTo May 16, 2024
642dc0e
Merge pull request #1263 from firewalla/beta_8_staging
MelvinTo May 16, 2024
b8fa16c
Merge pull request #1264 from firewalla/beta_8_staging
MelvinTo May 16, 2024
6a251a4
Merge pull request #1265 from firewalla/beta_8_staging
MelvinTo May 16, 2024
afe3ab9
Merge pull request #1266 from firewalla/beta_8_staging
MelvinTo May 17, 2024
c14fff8
Merge pull request #1274 from firewalla/master
MelvinTo May 31, 2024
cb48ca7
Merge pull request #1275 from firewalla/master
MelvinTo May 31, 2024
d76b3db
Merge pull request #1276 from firewalla/master
MelvinTo May 31, 2024
bd6fbe7
Merge pull request #1278 from firewalla/master
MelvinTo May 31, 2024
83b6844
Merge pull request #1282 from firewalla/master
MelvinTo Jun 6, 2024
7af918f
Merge pull request #1283 from firewalla/master
MelvinTo Jun 6, 2024
6f54f28
Merge pull request #1284 from firewalla/master
MelvinTo Jun 6, 2024
4d46cc6
Merge pull request #1290 from firewalla/master
MelvinTo Jun 13, 2024
1355243
Merge pull request #1291 from firewalla/master
MelvinTo Jun 13, 2024
07cf6a6
Merge pull request #1292 from firewalla/master
MelvinTo Jun 13, 2024
1ab63fc
Merge pull request #1301 from firewalla/master
MelvinTo Jun 18, 2024
5d5c075
Merge pull request #1302 from firewalla/master
MelvinTo Jun 18, 2024
ed02130
Merge pull request #1303 from firewalla/master
MelvinTo Jun 18, 2024
c40020c
Merge pull request #1304 from firewalla/master
MelvinTo Jun 18, 2024
2aa3901
Merge pull request #1310 from firewalla/beta_8_staging
MelvinTo Jul 2, 2024
e3e6f1d
Merge pull request #1311 from firewalla/beta_8_0
MelvinTo Jul 2, 2024
4232d1b
Merge pull request #1324 from firewalla/beta_8_staging
MelvinTo Aug 21, 2024
7905256
transient firewall during reboot/restart
jasonlyc Aug 22, 2024
555e208
Merge pull request #1328 from jasonlyc/beta_8_staging2
MelvinTo Aug 22, 2024
3275159
Merge pull request #1331 from firewalla/beta_8_staging
MelvinTo Aug 22, 2024
52d0770
transient firewall during reboot/restart
jasonlyc Aug 22, 2024
96c1384
Merge pull request #1333 from jasonlyc/beta_19_staging
MelvinTo Aug 22, 2024
64d370e
Merge branch 'beta_7_0' into beta_8_staging2
jasonlyc Aug 23, 2024
6bd127b
Merge pull request #1335 from jasonlyc/beta_8_staging2
MelvinTo Aug 23, 2024
fe0120a
Merge pull request #1334 from firewalla/beta_8_staging2
MelvinTo Aug 23, 2024
39ebde9
Merge pull request #1337 from firewalla/beta_8_staging2
MelvinTo Aug 23, 2024
189fda2
improvements to reduce iptables downtime
jasonlyc Aug 25, 2024
b5366f8
Merge pull request #1339 from jasonlyc/beta_8_staging2
MelvinTo Aug 25, 2024
e29d576
Merge pull request #1341 from firewalla/beta_8_staging2
MelvinTo Aug 25, 2024
f250545
Merge pull request #1342 from firewalla/beta_8_staging2
MelvinTo Aug 25, 2024
002e7fa
Merge pull request #1343 from firewalla/beta_8_staging2
MelvinTo Aug 25, 2024
7ce65fb
Merge pull request #1349 from firewalla/beta_8_staging
MelvinTo Sep 2, 2024
9d2b1d0
Merge pull request #1350 from firewalla/beta_8_staging
MelvinTo Sep 2, 2024
437a4f2
Merge pull request #1351 from firewalla/beta_8_staging
MelvinTo Sep 2, 2024
1947bae
Merge pull request #1362 from firewalla/master
MelvinTo Sep 12, 2024
f9de7c5
Merge pull request #1363 from firewalla/master
MelvinTo Sep 12, 2024
8fdffa2
Merge pull request #1364 from firewalla/master
MelvinTo Sep 12, 2024
9d8c048
Merge pull request #1365 from firewalla/master
MelvinTo Sep 12, 2024
bcfb090
Merge pull request #1372 from firewalla/master
MelvinTo Sep 24, 2024
533339b
Merge pull request #1373 from firewalla/master
MelvinTo Sep 24, 2024
3d53850
Merge pull request #1374 from firewalla/master
MelvinTo Sep 24, 2024
ea5d29c
Merge pull request #1375 from firewalla/master
MelvinTo Sep 24, 2024
d035b92
Merge pull request #1379 from firewalla/master
MelvinTo Oct 9, 2024
326ca6f
Merge pull request #1380 from firewalla/master
MelvinTo Oct 9, 2024
5d364fb
Merge pull request #1381 from firewalla/master
MelvinTo Oct 9, 2024
6022490
Merge pull request #1382 from firewalla/master
MelvinTo Oct 9, 2024
e7b0c91
Merge pull request #1387 from firewalla/master
MelvinTo Oct 18, 2024
77a10be
Merge pull request #1388 from firewalla/master
MelvinTo Oct 18, 2024
adabf35
Merge pull request #1389 from firewalla/master
MelvinTo Oct 18, 2024
c1b417d
Merge pull request #1390 from firewalla/master
MelvinTo Oct 18, 2024
32dda6d
Merge pull request #1393 from firewalla/master
MelvinTo Oct 21, 2024
170fd8b
Merge pull request #1394 from firewalla/master
MelvinTo Oct 21, 2024
5a3e76b
Merge pull request #1395 from firewalla/master
MelvinTo Oct 21, 2024
84337c2
Merge pull request #1396 from firewalla/master
MelvinTo Oct 21, 2024
d35c660
Merge pull request #1399 from firewalla/master
MelvinTo Oct 23, 2024
e835e87
Merge pull request #1400 from firewalla/master
MelvinTo Oct 23, 2024
d74b891
Merge pull request #1402 from firewalla/master
MelvinTo Oct 23, 2024
ffdb850
Merge pull request #1401 from firewalla/master
MelvinTo Oct 24, 2024
c8edfed
Merge pull request #1405 from firewalla/master
MelvinTo Oct 24, 2024
2a155ac
Merge pull request #1406 from firewalla/master
MelvinTo Oct 24, 2024
65141b3
Merge pull request #1407 from firewalla/master
MelvinTo Oct 24, 2024
5740a18
Merge pull request #1408 from firewalla/master
MelvinTo Oct 24, 2024
b4cde76
Merge pull request #1418 from firewalla/master
MelvinTo Dec 9, 2024
cb62d4d
Merge pull request #1419 from firewalla/master
MelvinTo Dec 9, 2024
62fd632
Merge pull request #1420 from firewalla/master
MelvinTo Dec 9, 2024
981e378
Merge pull request #1421 from firewalla/master
MelvinTo Dec 9, 2024
cda59a8
Merge pull request #1424 from firewalla/beta_8_staging
MelvinTo Dec 13, 2024
96019ba
Merge pull request #1425 from firewalla/beta_8_staging
MelvinTo Dec 13, 2024
e20adf1
Merge pull request #1426 from firewalla/beta_8_staging
MelvinTo Dec 13, 2024
b1d34f7
Merge pull request #1427 from firewalla/beta_8_staging
MelvinTo Dec 13, 2024
8327d18
Merge pull request #1468 from firewalla/beta_8_staging
MelvinTo Apr 28, 2025
2d3adf9
Merge pull request #1473 from firewalla/beta_8_staging
MelvinTo Apr 29, 2025
f79d1b1
Merge pull request #1476 from firewalla/beta_8_staging
MelvinTo Apr 29, 2025
dd35109
Merge pull request #1479 from firewalla/beta_8_staging
MelvinTo Apr 30, 2025
890d702
Merge pull request #1480 from firewalla/beta_8_staging
MelvinTo May 6, 2025
ca0165e
Merge pull request #1481 from firewalla/beta_8_staging
MelvinTo May 6, 2025
c0cc47a
Merge pull request #1482 from firewalla/beta_8_staging
MelvinTo May 6, 2025
1bcdeb2
Merge pull request #1486 from firewalla/beta_8_staging
MelvinTo May 12, 2025
d24e70b
Merge pull request #1487 from firewalla/beta_8_staging
MelvinTo May 12, 2025
b29aa34
Merge pull request #1488 from firewalla/beta_8_staging
MelvinTo May 12, 2025
146511c
Merge pull request #1489 from firewalla/beta_8_staging
MelvinTo May 12, 2025
5a60887
Merge pull request #1494 from firewalla/beta_8_staging
MelvinTo May 16, 2025
cb79629
Merge pull request #1495 from firewalla/beta_8_staging
MelvinTo May 16, 2025
92f6a12
Merge pull request #1496 from firewalla/beta_8_staging
MelvinTo May 16, 2025
39e2eff
Merge pull request #1497 from firewalla/beta_8_staging
MelvinTo May 16, 2025
59f5c39
Merge pull request #1501 from firewalla/beta_8_staging
MelvinTo Jun 9, 2025
1b0a9e2
Merge pull request #1502 from firewalla/beta_8_staging
MelvinTo Jun 9, 2025
ef37d5e
Merge pull request #1503 from firewalla/beta_8_staging
MelvinTo Jun 9, 2025
fa09540
Merge pull request #1504 from firewalla/beta_8_staging
MelvinTo Jun 9, 2025
393f0bd
Merge pull request #1508 from firewalla/beta_8_staging
MelvinTo Jun 23, 2025
21bb48a
Merge pull request #1510 from firewalla/beta_8_staging
MelvinTo Jun 23, 2025
eb3fdbd
Merge pull request #1509 from firewalla/beta_8_staging
MelvinTo Jun 23, 2025
63e343d
Merge pull request #1507 from firewalla/beta_8_staging
MelvinTo Jun 23, 2025
3c998ee
Merge pull request #1515 from firewalla/beta_8_staging
MelvinTo Jul 22, 2025
f7c5151
Merge pull request #1516 from firewalla/beta_8_staging
MelvinTo Jul 22, 2025
a1a1b93
Merge pull request #1517 from firewalla/beta_8_staging
MelvinTo Jul 22, 2025
3aa8c2a
Merge pull request #1518 from firewalla/beta_8_staging
MelvinTo Jul 22, 2025
88f8107
Merge pull request #1522 from firewalla/beta_8_staging
MelvinTo Jul 30, 2025
065744e
Merge pull request #1521 from firewalla/beta_8_staging
MelvinTo Jul 30, 2025
72c2983
Merge pull request #1523 from firewalla/beta_8_staging
MelvinTo Jul 30, 2025
e0b32d0
Merge pull request #1524 from firewalla/beta_8_staging
MelvinTo Jul 30, 2025
e9207bf
Merge pull request #1529 from firewalla/beta_8_staging
MelvinTo Aug 13, 2025
6cf9538
Merge pull request #1532 from firewalla/beta_8_staging
MelvinTo Aug 13, 2025
608c29f
Merge pull request #1531 from firewalla/beta_8_staging
MelvinTo Aug 13, 2025
b00bbc4
Merge pull request #1530 from firewalla/beta_8_staging
MelvinTo Aug 13, 2025
713d31d
Merge pull request #1538 from firewalla/master
MelvinTo Aug 21, 2025
9fc399a
Merge pull request #1537 from firewalla/master
MelvinTo Aug 21, 2025
2719856
Merge pull request #1536 from firewalla/master
MelvinTo Aug 21, 2025
0b3f51b
Merge pull request #1535 from firewalla/master
MelvinTo Aug 21, 2025
a02eae5
fix cache bugs
caixingcheng Sep 12, 2025
452a945
fix cache bugs
caixingcheng Sep 12, 2025
0e3d28f
fix cache bugs
caixingcheng Sep 12, 2025
c03df09
fix cache bugs
caixingcheng Sep 12, 2025
195cc74
Merge pull request #1554 from jasonlyc/beta_13_staging
MelvinTo Sep 16, 2025
d102bb8
Merge pull request #1556 from jasonlyc/beta_15_staging
MelvinTo Sep 16, 2025
c314e93
Merge pull request #1557 from jasonlyc/beta_17_staging
MelvinTo Sep 16, 2025
2441e6a
Merge pull request #1558 from jasonlyc/beta_19_staging
MelvinTo Sep 16, 2025
4f63625
Merge pull request #1583 from firewalla/master
MelvinTo Nov 7, 2025
33f2906
Merge branch 'beta_8_staging' of https://github.com/firewalla/firerou…
jasonlyc Nov 10, 2025
9cc3cf1
Merge pull request #1594 from firewalla/master
MelvinTo Nov 11, 2025
fbaa099
Merge pull request #1604 from firewalla/master
MelvinTo Nov 14, 2025
716b15b
Merge pull request #1610 from firewalla/master
MelvinTo Nov 18, 2025
86becd0
Merge pull request #1614 from firewalla/master
MelvinTo Nov 25, 2025
7289e08
Merge pull request #1619 from firewalla/master
MelvinTo Nov 27, 2025
dce8172
Merge pull request #1627 from firewalla/master
MelvinTo Dec 3, 2025
b169b56
Merge pull request #1631 from firewalla/master
MelvinTo Dec 3, 2025
a879ea2
Merge pull request #1637 from firewalla/master
MelvinTo Dec 5, 2025
467211c
Merge branch 'beta_21_staging' of https://github.com/firewalla/firero…
jasonlyc Dec 5, 2025
74283a5
Merge branch 'beta_19_staging' into beta_21_staging
jasonlyc Dec 5, 2025
ad8c322
Merge pull request #1643 from jasonlyc/beta_21_staging
MelvinTo Dec 5, 2025
64e0660
Merge pull request #1646 from firewalla/master
MelvinTo Dec 8, 2025
f1b620e
Merge branch 'beta_13_staging' into beta_21_staging
jasonlyc Dec 9, 2025
58a60fc
Merge pull request #1650 from jasonlyc/beta_21_staging
MelvinTo Dec 9, 2025
672dfa4
resolve conflict
jasonlyc Dec 11, 2025
a0afe78
Merge pull request #1652 from jasonlyc/beta_21_staging
MelvinTo Dec 11, 2025
3fd2127
resolve conflict
jasonlyc Dec 11, 2025
28ec3cd
Merge pull request #1654 from jasonlyc/beta_21_staging
MelvinTo Dec 11, 2025
2606648
Merge pull request #1657 from firewalla/master
MelvinTo Dec 12, 2025
9750ca5
resolve conflict
jasonlyc Dec 12, 2025
45510a8
Merge pull request #1667 from jasonlyc/beta_21_staging
MelvinTo Dec 15, 2025
048bb5b
reduce network config apply time consumption by parallelizing some pl…
jasonlyc Dec 11, 2025
ab81c64
fix a bug for wireguard server ipv6
chgchi Dec 16, 2025
4af72cd
disable mt7996e kernel log in rsyslog
jasonlyc Dec 16, 2025
78d55fc
Remove dhcpcd stdout from syslog
xinnige Dec 16, 2025
39c76f9
Merge pull request #1675 from jasonlyc/beta_21_staging
MelvinTo Dec 22, 2025
d092226
Merge branch 'beta_21_staging' of https://github.com/firewalla/firero…
jasonlyc Dec 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.