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

merge from beta_6 #1235

Merged
merged 138 commits into from
Nov 6, 2018
Merged

merge from beta_6 #1235

merged 138 commits into from
Nov 6, 2018

Conversation

MelvinTo
Copy link
Collaborator

@MelvinTo MelvinTo commented Nov 6, 2018

No description provided.

MelvinTo and others added 30 commits June 19, 2018 12:41
@MelvinTo
Merge pull request #934 from firewalla/master
cc6def9 
Beta Release 1.956
@MelvinTo
allow log.info for some key logs
8114bec
@MelvinTo
revert changes not to be added to beta at this moment
b4e9e40
@MelvinTo
Merge pull request #985 from MelvinTo/beta_6_0
4db3b9a 
Patch: force some log.infos to be printed in production
@MelvinTo
Change heartbeat log level to INFO
a7606db
@MelvinTo
bug fix
31ceb78
@MelvinTo
Add log info when firemon is waiting for binding
2d4c155
@MelvinTo
Disable setLanguage feature temporarily
37ff119
@MelvinTo
No need to throw error if not having p.dest.ip, just skip destinfo en…
1203712 
…richment
@MelvinTo
bug fix
c72e3d6
@MelvinTo
reduce the check time for firemain-ping
2cad38e
@MelvinTo
use /dev/shm for firemain/mon ping
df59542
@MelvinTo
bug fix
1d77ee0
@MelvinTo
bug fix
dc0233e
@MelvinTo
bug fix
ea8e0ff
@MelvinTo
Merge pull request #987 from MelvinTo/beta_6_0
2a27c70 
Beta Patch: Change heartbeat log level to INFO
@MelvinTo
BUG: only one vpn gen script should be running at same time
c5e611f
@MelvinTo
Merge branch 'beta_6_0' of https://github.com/melvinto/firewalla into…
38d6e70 
… beta_6_0
@MelvinTo
revert change on vpn Default.txt
1085667
@MelvinTo
Merge pull request #989 from MelvinTo/beta_6_0
3844bb1 
Patch: only one vpn gen script should be running at same time
@MelvinTo
BUG: update policy not working for device level policy
ef2ad4c
@MelvinTo
Merge branch 'beta_6_0' of https://github.com/MelvinTo/not_firewalla …
342e907 
…into beta_6_0
@MelvinTo
support category and device level scope on creating exception from alarm
057e029
@MelvinTo
Merge pull request #995 from MelvinTo/beta_6_0
6f07c31 
support category and device level scope on creating exception from alarm
@MelvinTo
reduce the freq of dnsmasq reload
a1dfcb4
@MelvinTo
reload dnsmasq only necessary
d70ea1c
@MelvinTo
Merge branch 'beta_6_0' of https://github.com/melvinto/firewalla into…
1fedea0 
… beta_6_0
@MelvinTo
Revert "BUG: update policy not working for device level policy"
c181bbd 
This reverts commit ef2ad4c.
@MelvinTo
suppress spoof status changed log to reduce logs
32d744c
@MelvinTo
BUG: monitor scripts might force restart firemain/man during first setup
2532abd
MelvinTo and others added 29 commits August 21, 2018 19:08
@MelvinTo
bug fix
06ac2bb
@MelvinTo
Merge pull request #1081 from MelvinTo/beta_6_0_staging
2d933d9 
bug fix
@MelvinTo
bug fix
346a918
@MelvinTo
Merge pull request #1082 from MelvinTo/beta_6_0_staging
49d6fdb 
bug fix
@MelvinTo
mege
7b5cdeb
@MelvinTo
Merge pull request #1083 from MelvinTo/beta_6_0_staging
7273a2b 
merge
@MelvinTo
Update sanity check script to add b7
59ef179
@MelvinTo
Merge pull request #1085 from MelvinTo/beta_6_0_staging
07370ff 
change led off
@MelvinTo
Merge pull request #1074 from firewalla/beta_6_0_staging
177dec6 
Beta Patch - 20180821
@jasonlyc @MelvinTo
apply spoof policy even if policy is not changed
ae7a2b1
@MelvinTo
Merge pull request #1088 from MelvinTo/beta_6_0_staging
3dc8312 
Patch: apply spoof policy even if policy is not changed
@MelvinTo
BUG: removeOnSuccess and removeOnFailure didn't take effect
05ad624
@jasonlyc @MelvinTo
add cronjob to restart bitbridge7 if necessary
ea21667
@jasonlyc @MelvinTo
only add/remove cronjob in bitbridge.js
dddfb39
@jasonlyc @MelvinTo
determine mode and bitbridge service status in cronjob
d16ae0b
@MelvinTo
Merge branch 'beta_6_0_staging' of https://github.com/melvinto/firewalla
a0e062d 
 into beta_6_0_staging
@MelvinTo
Merge pull request #1092 from MelvinTo/beta_6_0_staging
e0aa9a9 
Beta 6 0 staging
@MelvinTo
bitbridge-ping.sh +x
9279c9d
@MelvinTo
Merge pull request #1100 from MelvinTo/beta_6_0_staging
f3ef3b3 
bitbridge-ping.sh +x
@MelvinTo
BUG: use firewalla.encipher.io instead of github for dns status check
27c7be9
@MelvinTo
Merge pull request #1101 from MelvinTo/beta_6_0_staging
f77dc29 
BUG: use firewalla.encipher.io instead of github for dns status check
@MelvinTo
change log level
06fcfbb
@MelvinTo
Merge branch 'beta_6_0_staging' of https://github.com/melvinto/firewalla
38cc370 
 into beta_6_0_staging
@MelvinTo
Merge pull request #1108 from MelvinTo/beta_6_0_staging
6208556 
Beta 6 0 staging
@jasonlyc @MelvinTo
add multiple domains for dnsmasq to check DNS connectivity
c703e67
@MelvinTo
Merge pull request #1110 from MelvinTo/beta_6_0_staging
42ca34c 
add multiple domains for dnsmasq to check DNS connectivity
@MelvinTo
Merge pull request #1089 from firewalla/beta_6_0_staging
44a0b29 
Patches
@MelvinTo
Merge branch 'beta_6_0' of https://github.com/firewalla/firewalla int…
a433d55 
…o beta_7_0_staging

# Conflicts:
#	alarm/AlarmManager2.js
#	alarm/ExceptionManager.js
#	alarm/PolicyManager2.js
#	controllers/netbot.js
#	hook/DeviceHook.js
#	locales/en.json
#	net2/BroDetect.js
#	net2/ModeManager.js
#	net2/config.json
#	net2/main.js
#	scripts/fireupgrade.sh
#	sys/kickstart.js
#	util/Led.js
#	vpn/Default.txt
#	vpn/VpnManager.js
@MelvinTo
Merge pull request #1234 from MelvinTo/beta_7_0_staging
cec20d0 
merge from beta_6
@MelvinTo MelvinTo merged commit 51d1baf into beta_7_0 Nov 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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 @duzitong @jasonlyc @jerrchen