On Tue, Dec 08, 2015 at 02:23:50PM +0000, 'Lisa Velden' via ganeti-devel wrote: > commit 8e29296fed4a258d948f2c58439ac0e5469c52fa > Merge: cdc923a cd0db80 > Author: Lisa Velden <[email protected]> > Date: Tue Dec 8 14:05:52 2015 +0100 > > Merge branch 'stable-2.17' into master > > * stable-2.17 > (no changes) > * stable-2.16 > Fix lines with more than 80 characters > Add more detach/attach sequence tests > Allow disk attachment to diskless instances > Improve tests for attaching disks > Use only string value in error message > Add entries describing new gnt-cluster params to manpage > QA: Add ssh-key-type and -bits tests > QA: Extend AssertCommand to allow not forwarding the agent > Remove default limit on diffs in cfgupgrade tests > QA: Downgrade the cluster key type in 2.16 > Fix typo > Fail early for invalid key type and size combinations > Handle SSH key changes in upgrades and downgrades > Allow SSH key property changes > Use the SSH key parameters when generating keys > Do not generate the ganeti_pub_keys file with --no-ssh-init > Add querying of ssh-related config values > Add modify_ssh_setup to queryable config params > Add helper function for querying cluster properties > Show info about new params in gnt-cluster info > Add the SSH key type and length to the config, and set them > Change SSH key types to a proper Haskell sum type > Add the SSH key options > Mention disabling of '--no-node-setup' in NEWS file > Show 'modify ssh setup' in cluster info > Disable --no-node-setup > Make 'modify ssh setup' queryable > Fix RPC signature of NodeVerify > Use ssconf for SSH ports in NodeVerify > * stable-2.15 > Document the decission why optimisation is turned off > Don't keep input for error messages > Use dict.copy instead of deepcopy > Use bulk-adding of keys in renew-crypto > Make NodeSshKeyAdd use its *Bulk companion > Unit test bulk-adding normal nodes > Unit test for bulk-adding pot. master candidates > Introduce bulk-adding of SSH keys > Pause watcher during performance QA > Send answers strictly > Store keys as ByteStrings > Encode UUIDs as ByteStrings > Prefer the UuidObject type class over specific functions > Assign the variables before use (bugfix for dee6adb9) > Extend QA to detect autopromotion errors > Handle SSH key distribution on auto promotion > Do not remove authorized key of node itself > Fix indentation > Support force option for deactivate disks on RAPI > * stable-2.14 > Fix faulty iallocator type check > Improve cfgupgrade output in case of errors > * stable-2.13 > Extend timeout for gnt-cluster renew-crypto > Reduce flakyness of GetCmdline test on slow machines > Remove duplicated words > * stable-2.12 > Revert "Also consider connection time out a network error" > Clone lists before modifying > Make lockConfig call retryable > Return the correct error code in the post-upgrade script > Make openssl refrain from DH altogether > Fix upgrades of instances with missing creation time > * stable-2.11 > (no changes) > * stable-2.10 > Remove -X from hspace man page > Make htools tolerate missing "dtotal" and "dfree" on luxi > > Conflicts: > man/hspace.rst > > Resolution: > man/hspace.rst: take the version from HEAD
LGTM -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Matthew Scott Sucherman, Paul Terence Manicle
