Skip to content
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

Jump to bottom

1.961 - Beta Patch #1346

Merged
merged 38 commits into from Jan 22, 2019
Merged

1.961 - Beta Patch #1346

merged 38 commits into from Jan 22, 2019

Conversation

MelvinTo
Copy link
Collaborator

No description provided.

MelvinTo and others added 30 commits November 7, 2018 01:07
@MelvinTo
Merge pull request #1 from firewalla/beta_7_0
4c89e33 
sync beta_7_0 back
@drahnieR @MelvinTo
catch ps errors
7d93f3e
@jasonlyc @MelvinTo
fix wrong ob/rb in port flows in BroDetect.js
3ebff61
@MelvinTo
copy connection object to avoid interference between different dst ports
71a30c8
@jasonlyc @MelvinTo
add category block rules into filter table
747b60b
@MelvinTo
Revert to old ways of blocking category
04e1e22
@MelvinTo
use both for better security and testing
852f8f4
@MelvinTo
Merge branch 'beta_7_0' of https://github.com/melvinto/firewalla into…
01be0c0 
… beta_7_0
@MelvinTo
merge from master
964e2ea
@MelvinTo
update version number
f8d3ef3
@jasonlyc @MelvinTo
upmp check task will only run in FireMain
19bb6c1
@MelvinTo
beta_7_0 is alpha now
9389bec
@MelvinTo
add isAlpha
d5f1b49
@MelvinTo
use beta as workaround for alpha
01a4de6
@MelvinTo
BUG: auto migrate buggy legacy weekdays/weekends schedule format
0244d63
@MelvinTo
fix bug
1c9fc4a
@MelvinTo
bug fix
2138dd2
@MelvinTo
Merge pull request #1305 from MelvinTo/beta_7_0
4f7d40c 
1.960 beta_7 patch
@MelvinTo
Merge pull request #56 from MelvinTo/beta_7_0_staging
7874dfd 
Beta 7 0 staging
@MelvinTo
Merge pull request #1309 from firewalla/beta_7_0_staging
20e7ff3 
Beta 7 Patch - 1.960
@MelvinTo
revert isAlpha change
106cee0
@MelvinTo
function name was changed in master
a2860e6
@MelvinTo
Merge branch 'beta_7_0' of https://github.com/melvinto/not_firewalla …
96d8022 
…into beta_7_0
@MelvinTo
Merge pull request #1314 from MelvinTo/beta_7_0
bcbfbe7 
 function name was changed in master
@jasonlyc @MelvinTo
Cleanup categoryflow:* in OldDataCleanSensor
f4a228c
@jasonlyc @MelvinTo
Add categoryflow:* into OldDataCleanSensor config
3173ef0
@jasonlyc @MelvinTo
extend default crl days to 3600 in ovpngen.sh
fec4704
@MelvinTo
check whether o is null from results of hgetall in HostManager.getHosts
d1306bb
@MelvinTo
update version number
de91649
@MelvinTo
BUG: partial fix on flush ips on eth0 before restore saved ip in chec…
556d7c4 
…k_fix_network
@MelvinTo MelvinTo merged commit dca05ff into beta_6_0 Jan 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jerrchen jerrchen jerrchen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@MelvinTo @jerrchen @drahnieR @jasonlyc