LGTM, thanks On Tue, Jan 5, 2016 at 11:51 AM, 'Helga Velroyen' via ganeti-devel < [email protected]> wrote:
> commit 0d10936ea1741b381583dc1a03aac4816f3b6014 > Merge: cd0db80 23503ae > Author: Helga Velroyen <[email protected]> > Date: Tue Jan 5 11:13:22 2016 +0100 > > Merge branch 'stable-2.16' into stable-2.17 > > * stable-2.16 > Fix typo 'option' instead of 'options' > Fix error message in attachInstanceDiskChecks > Update documentation of harep > Document harep --dry-run in the man page > Support --dry-run in harep > Add a --dry-run option to htools > > * stable-2.15 > Add more documentation to testutils_ssh.py > renew-crypto: use bulk-removal of SSH keys > Use bulk-removal of SSH keys for single keys > Bulk-removing SSH keys of diverse set of nodes > Bulk-removal of SSH keys of normal nodes > Bulk-remove SSH keys of potential master candidates > Bulk-removal of SSH keys > testutils: add keys to own 'authorized_keys' file > Make mock SSH file manager deal with lists > Don't deepcopy the config if the old value is not needed > Revision bump for 2.15.2 > Update NEWS file for 2.15.2 > Compute lock allocation strictly > > * stable-2.14 > Revision bump for 2.14.2 > Update NEWS file for 2.14.2 > Fix lines with more than 80 characters > Add more detach/attach sequence tests > Allow disk attachment to diskless instances > Improve tests for attaching disks > > * stable-2.13 > Revision bump for 2.13.3 > Update NEWS file for 2.13.3 > > * stable-2.12 > Bump revision number for 2.12.6 > Update NEWS file for 2.12.6 > Restrict showing of DRBD secret using types > Calculate correct affected nodes set in InstanceChangeGroup > > * stable-2.11 > Revision bump for 2.11.8 > Update NEWS file for 2.11.8 > > * stable-2.10 > Version bump for 2.10.8 > Update NEWS file for 2.10.8 > > * stable-2.9 > Bump revision number > Update NEWS file for 2.9.7 release > Improve RAPI section on security > QA: Ensure the DRBD secret is not retrievable via RAPI > Redact the DRBD secret in instance queries > Do not attempt to use the DRBD secret in gnt-instance info > > Conflicts: > src/Ganeti/HTools/Program/Harep.hs > > Resolutions: > Harep.hs: use detectBroken from Repair.hs > > Signed-off-by: Helga Velroyen <[email protected]> > > diff --cc src/Ganeti/HTools/CLI.hs > index d24392d,7ca25d9..110375e > --- a/src/Ganeti/HTools/CLI.hs > +++ b/src/Ganeti/HTools/CLI.hs > @@@ -55,14 -55,12 +55,15 @@@ module Ganeti.HTools.CL > -- * The options > , oDataFile > , oDiskMoves > + , oAvoidDiskMoves > , oDiskTemplate > + , oDryRun > , oSpindleUse > , oDynuFile > + , oMemWeight > , oMonD > , oMonDDataFile > + , oMonDKvmRSS > , oMonDXen > , oEvacMode > , oMonDExitMissing > diff --cc src/Ganeti/HTools/Program/Harep.hs > index c81bef8,8ad7deb..3010bf8 > --- a/src/Ganeti/HTools/Program/Harep.hs > +++ b/src/Ganeti/HTools/Program/Harep.hs > @@@ -42,9 -42,13 +42,10 @@@ module Ganeti.HTools.Program.Hare > import Control.Exception (bracket) > import Control.Lens (over) > import Control.Monad > -import Data.Function > -import Data.List > import Data.Maybe > -import Data.Ord > import System.Time > import qualified Data.Map as Map > + import qualified Text.JSON as J > > import Ganeti.BasicTypes > import Ganeti.Common > diff --cc src/Ganeti/Locking/Allocation.hs > index a17efb7,d1caa2a..4a681b4 > --- a/src/Ganeti/Locking/Allocation.hs > +++ b/src/Ganeti/Locking/Allocation.hs > @@@ -49,13 -50,11 +50,14 @@@ module Ganeti.Locking.Allocatio > , freeLocks > ) where > > -import Control.Applicative (liftA2, (<$>), (<*>), pure) > +import Prelude () > +import Ganeti.Prelude > + > +import Control.Applicative (liftA2) > import Control.Arrow (second, (***)) > -import Control.Monad > +import Control.Monad (unless, guard, foldM, when) > import Data.Foldable (for_, find) > + import Data.List (foldl') > import qualified Data.Map as M > import Data.Maybe (fromMaybe) > import qualified Data.Set as S > -- > > Helga Velroyen > Software Engineer > [email protected] > > Google Germany GmbH > Dienerstraße 12 > 80331 München > > Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > > Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, > leiten Sie diese bitte nicht weiter, informieren Sie den Absender und > löschen Sie die E-Mail und alle Anhänge. Vielen Dank. > > This e-mail is confidential. If you are not the right addressee please do > not forward it, please inform the sender, and please erase this e-mail > including any attachments. Thanks. > > Hrvoje Ribicic Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Geschäftsführer: Matthew Scott Sucherman, Paul Terence Manicle Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und löschen Sie die E-Mail und alle Anhänge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks.
