Commit Graph

11 Commits

Author SHA1 Message Date
Itay Mizeretz be5d17ab42 Merge branch 'develop' into bugfix/upgrade-windows-32-to-64
# Conflicts:
#	infection_monkey/monkey.py
2018-04-11 19:21:52 +03:00
Itay Mizeretz 148684d78f Fixed most CR 2018-04-11 19:07:03 +03:00
Itay Mizeretz 450f3ed3be Use 32bit as default path 2018-03-04 17:50:35 +02:00
Itay Mizeretz 72fd930499 unlock singleton before upgrade 2018-02-28 19:54:10 +02:00
Itay Mizeretz 784e383959 Check if should upgrade only once
Don't send state-done telemetry if upgrading
2018-02-28 19:38:05 +02:00
Itay Mizeretz abd738acbc Change config value name
Add logs
2018-02-28 19:01:42 +02:00
Itay Mizeretz e30e9c8b83 Upgrade after finding server 2018-02-28 16:23:54 +02:00
Itay Mizeretz 355a75feef seperate the wakeup and server lookup processes 2018-02-28 16:21:44 +02:00
Itay Mizeretz 8509eef48e Add basic logic to windows upgrade 2018-02-28 14:10:01 +02:00
Itay Mizeretz a20cb16b48 Merge branch 'develop' into feature/send-raw-log
# Conflicts:
#	infection_monkey/main.py
#	monkey_island/cc/app.py
#	monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
2018-02-27 19:32:28 +02:00
Itay Mizeretz de4e4b9ea1 rename chaos_monkey folder to infection_monkey 2018-02-19 11:35:34 +02:00