LGTM On Tue, May 3, 2016 at 11:18 AM, 'Brian Foley' via ganeti-devel < ganeti-devel@googlegroups.com> wrote:
> commit 3afc662c93d2d5292874b76fcbb6aa7eb1b74f57 > Merge: eb3f956 d5d747d > Author: Brian Foley <bpfo...@google.com> > Date: Tue May 3 10:59:05 2016 +0100 > > Merge branch 'stable-2.15' into stable-2.16 > > * 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 > > Manually resolve merge conflicts to Constants.hs > > Signed-off-by: Brian Foley <bpfo...@google.com> > > diff --cc src/Ganeti/Constants.hs > index 39a2f6d,09783d4..420ccb6 > --- a/src/Ganeti/Constants.hs > +++ b/src/Ganeti/Constants.hs > @@@ -5164,12 -5046,12 +5164,12 @@@ luxiReqAll > ] > > luxiDefCtmo :: Int > -luxiDefCtmo = 10 > +luxiDefCtmo = 30 > > luxiDefRwto :: Int > -luxiDefRwto = 60 > +luxiDefRwto = 180 > > - -- | 'WaitForJobChange' timeout > + -- | Luxi 'WaitForJobChange' timeout > luxiWfjcTimeout :: Int > luxiWfjcTimeout = (luxiDefRwto - 1) `div` 2 > > @@@ -5491,7 -5369,10 +5491,15 @@@ dataCollectorsEnabledName = "enabled_da > dataCollectorsIntervalName :: String > dataCollectorsIntervalName = "data_collector_interval" > > +-- * HTools tag prefixes > + > +exTagsPrefix :: String > +exTagsPrefix = Tags.exTagsPrefix > ++ > + -- | The polling frequency to wait for a job status change > + cliWfjcFrequency :: Int > + cliWfjcFrequency = 20 > + > + -- | Default 'WaitForJobChange' timeout in seconds > + defaultWfjcTimeout :: Int > + defaultWfjcTimeout = 60 >
