Merge branch 'next' into branch-2.1
* next: Add script to clean archived jobs after 21 days rapi: export more static node information Pass the correct signal to handlers cli: Use ToStdout/ToStderr instead of print Fix small typo in gnt-node Simplify handling of boolean args in rapi Fix checks in LUSetNodeParms for the master node Improve the example startup script Fix insserv dependencies Conflicts: Makefile.am: added ganeti-cleaner doc/examples/ganeti.initd.in: Iustin's init script improvements lib/cli.py: Trivial (ToStderr changes)
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- Makefile.am 10 additions, 0 deletionsMakefile.am
- daemons/ganeti-cleaner.in 39 additions, 0 deletionsdaemons/ganeti-cleaner.in
- doc/examples/ganeti.cron.in 5 additions, 1 deletiondoc/examples/ganeti.cron.in
- doc/examples/ganeti.initd.in 52 additions, 42 deletionsdoc/examples/ganeti.initd.in
- lib/cli.py 1 addition, 0 deletionslib/cli.py
- lib/cmdlib.py 8 additions, 4 deletionslib/cmdlib.py
- lib/daemon.py 1 addition, 1 deletionlib/daemon.py
- lib/rapi/rlib2.py 4 additions, 3 deletionslib/rapi/rlib2.py
- scripts/gnt-node 1 addition, 1 deletionscripts/gnt-node
Loading
Please register or sign in to comment