Merge branch 'stable-2.8' into master
* stable-2.8: (42 commits) Add shelltests for hspace allocation hspace: Handle multiple ipolicy specs QA: Test multiple instance specs QA: Handle multiple instance specs Unit test for cli.FormatPolicyInfo() Add command-line support for multiple specs in ipolicy Add multiple min/max specs in instance policy Separate checks for std spec compliance QA: Transpose instance specs Improve check for "unreleased" versions in NEWS Update documentation for text format Add missing fields in htools text-backend documentation cfgupgrade: Remove enabled_disk_templates on downgrade Reason trail implementation for "start" Reason trail implementation for "shutdown" QA: More tests for instance policies in groups QA: Split function to set and parse instance policies QA: Update tests for new ipolicy specs command-line options Add unit tests for cfgupgrade with a real configuration Split functions in cfupgrade unit tests ... Conflicts: lib/backend.py lib/bdev.py man/gnt-cluster.rst lib/bdev.py was renamed to lib/block/bdev.py in master, so I've manually applied the bc3427b7 commit to the new file. The other two are straightforward conflicts. Signed-off-by:Bernardo Dal Seno <bdalseno@google.com> Reviewed-by:
Guido Trotter <ultrotter@google.com>
Showing
- Makefile.am 7 additions, 8 deletionsMakefile.am
- NEWS 127 additions, 86 deletionsNEWS
- autotools/check-news 24 additions, 4 deletionsautotools/check-news
- configure.ac 1 addition, 1 deletionconfigure.ac
- doc/rapi.rst 7 additions, 2 deletionsdoc/rapi.rst
- lib/backend.py 21 additions, 9 deletionslib/backend.py
- lib/block/bdev.py 4 additions, 2 deletionslib/block/bdev.py
- lib/bootstrap.py 5 additions, 0 deletionslib/bootstrap.py
- lib/cli.py 246 additions, 33 deletionslib/cli.py
- lib/client/gnt_cluster.py 34 additions, 14 deletionslib/client/gnt_cluster.py
- lib/client/gnt_group.py 40 additions, 27 deletionslib/client/gnt_group.py
- lib/cmdlib.py 92 additions, 68 deletionslib/cmdlib.py
- lib/config.py 2 additions, 1 deletionlib/config.py
- lib/constants.py 1 addition, 1 deletionlib/constants.py
- lib/errors.py 16 additions, 0 deletionslib/errors.py
- lib/hooksmaster.py 270 additions, 0 deletionslib/hooksmaster.py
- lib/mcpu.py 2 additions, 242 deletionslib/mcpu.py
- lib/objects.py 73 additions, 61 deletionslib/objects.py
- lib/rapi/client.py 9 additions, 2 deletionslib/rapi/client.py
- lib/rpc_defs.py 2 additions, 0 deletionslib/rpc_defs.py
Loading
Please register or sign in to comment