Merge lp://staging/~fo0bar/turku/turku-agent-gonogo into lp://staging/turku
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~fo0bar/turku/turku-agent-gonogo |
| Merge into: | lp://staging/turku |
| Diff against target: |
1081 lines (+983/-0) (has conflicts) 19 files modified
.bzrignore (+5/-0) MANIFEST.in (+3/-0) README (+4/-0) setup.py (+39/-0) turku-agent-ping (+20/-0) turku-agent-ping.service (+6/-0) turku-agent-ping.timer (+10/-0) turku-agent-rsyncd-wrapper (+20/-0) turku-agent-rsyncd.conf (+8/-0) turku-agent-rsyncd.init-debian (+55/-0) turku-agent-rsyncd.service (+10/-0) turku-agent.cron (+3/-0) turku-update-config (+20/-0) turku-update-config.service (+6/-0) turku-update-config.timer (+10/-0) turku_agent/ping.py (+211/-0) turku_agent/rsyncd_wrapper.py (+42/-0) turku_agent/update_config.py (+179/-0) turku_agent/utils.py (+332/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict adding file setup.py. Moved existing file to setup.py.moved. |
| To merge this branch: | bzr merge lp://staging/~fo0bar/turku/turku-agent-gonogo |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Canonical IS Reviewers | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 52. By Ryan Finnie
-
Allow gonogo_program to be stored in config, allow --gonogo-program to be shlex-split
- 51. By Colin Watson
-
On Upstart, check if turku-agent-rsyncd is already running before starting it.
Reviewed-on: https:/
/code.launchpad .net/~cjwatson/ turku/turku- agent-fix- rsyncd- interaction/ +merge/ 367847
Reviewed-by: Haw Loeung <email address hidden> - 50. By Colin Watson
-
Don't restart rsyncd when updating its configuration.
Reviewed-on: https:/
/code.launchpad .net/~cjwatson/ turku/turku- agent-fix- rsyncd- interaction/ +merge/ 367418
Reviewed-by: Haw Loeung <email address hidden> - 49. By Ryan Finnie
-
Fix Python 3 .values conversion with --restore
- 48. By Ryan Finnie
-
Remove early legacy config migrations/
mitigations - 47. By Ryan Finnie
-
Convert to Python 3
Program functionality is identical to previous, but will now need
to be installed with python3. - 46. By Ryan Finnie
-
turku-agent-ping: Add --gonogo-program
- 45. By Ryan Finnie
-
Fix incorrect description turku-update-
config. timer - 44. By Ryan Finnie
-
Add systemd timers for turku-agent-ping and turku-update-config
- 43. By Ryan Finnie
-
[jacekn] Make sure update_config errors are not ignored. This allows for hooks to fail on bad configuration.
