LGTM On Tue, May 3, 2016 at 11:47 AM, 'Brian Foley' via ganeti-devel < [email protected]> wrote:
> commit 394c8ffa24f93223049d11c6e7f676d04d5c4754 > Merge: b9de363 cf10806 > Author: Brian Foley <[email protected]> > Date: Tue May 3 11:32:16 2016 +0100 > > Merge branch 'stable-2.16' into stable-2.17 > > * stable-2.15 > Use socat method string compatible with <1.73 & >=1.73 > Reduce heap when parsing & storing ConfigData 10% > Cancel RAPI job if the client drops the connection > Make JQScheduler queues more strict to avoid leaks > > * stable-2.16 > <Nothing> > > Manually resolve Constants.hs merge conflict. Both branches appended. > > Signed-off-by: Brian Foley <[email protected]> > > diff --cc src/Ganeti/Constants.hs > index 7250372,420ccb6..13bff2e > --- a/src/Ganeti/Constants.hs > +++ b/src/Ganeti/Constants.hs > @@@ -5534,13 -5496,10 +5534,22 @@@ dataCollectorDiagnoseDirectory = syscon > exTagsPrefix :: String > exTagsPrefix = Tags.exTagsPrefix > > +-- * MaintD tag prefixes > + > +maintdPrefix :: String > +maintdPrefix = "maintd:" > + > +maintdSuccessTagPrefix :: String > +maintdSuccessTagPrefix = maintdPrefix ++ "repairready:" > + > +maintdFailureTagPrefix :: String > +maintdFailureTagPrefix = maintdPrefix ++ "repairfailed:" > ++ > + -- | The polling frequency to wait for a job status change > + cliWfjcFrequency :: Int > + cliWfjcFrequency = 20 > + > + -- | Default 'WaitForJobChange' timeout in seconds > + defaultWfjcTimeout :: Int > + defaultWfjcTimeout = 60 > ++ > diff --cc src/Ganeti/THH.hs > index 6dd552f,6a3cb8f..1133490 > --- a/src/Ganeti/THH.hs > +++ b/src/Ganeti/THH.hs > @@@ -93,10 -90,12 +93,11 @@@ import Data.Attoparsec.Text ( > -- See issue #683 and https://ghc.haskell.org/trac/ghc/ticket/4899 > import Data.Char > import Data.Function (on) > -import Data.List > +import Data.List (intercalate, groupBy, stripPrefix, sort, nub) > import Data.Maybe > import qualified Data.Map as M > -import Data.Monoid > import qualified Data.Set as S > + import qualified Data.Text as T > import Language.Haskell.TH > import Language.Haskell.TH.Syntax (lift) > >
