On Wed, Jul 17, 2013 at 6:42 PM, Klaus Aehlig <[email protected]> wrote:
> On Wed, Jul 17, 2013 at 05:48:43PM +0200, Klaus Aehlig wrote: > > On Wed, Jul 17, 2013 at 05:16:32PM +0200, Helga Velroyen wrote: > > > LGTM, thanks > > > > Unfortunately, I resolved the trivial conflict incorrectly. > > This is the correct way. > > Sorry again (pasting the wrong show). I meant. > > commit 3fd450adc05e35965fe206d2a40b55e1cd98c381 > Merge: 2650ea6 3695a4e > Author: Klaus Aehlig <[email protected]> > Date: Wed Jul 17 17:09:34 2013 +0200 > > Merge branch 'stable-2.8' into stable-2.9 > > * stable-2.8 > Rename queryd to luxid > Document the rapi client not to have a QueryNetworks method > Enable unit tests again > Document ganeti-queryd > Add ganeti-queryd to QA env test > Add queryd daemon (split from confd) > Extract ConfigReader from Confd/Server.hs > Add timestamps to haskell network query fields > > Conflicts: > src/Ganeti/Confd/Server.hs (trivial) > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc configure.ac > index 32b9c15,e047f14..6e0e7a1 > --- a/configure.ac > +++ b/configure.ac > @@@ -212,8 -243,9 +212,9 @@@ AC_ARG_WITH([user-prefix] > [user_masterd="${withval}masterd"; > user_rapi="${withval}rapi"; > user_confd="${withval}confd"; > + user_luxid="${withval}luxid"; > user_noded="$user_default"; > - user_mond="${withval}mond"], > + user_mond="$user_default"], > [user_masterd="$user_default"; > user_rapi="$user_default"; > user_confd="$user_default"; > diff --cc src/Ganeti/Confd/Server.hs > index f05d3b5,3df6f42..a27e3e4 > --- a/src/Ganeti/Confd/Server.hs > +++ b/src/Ganeti/Confd/Server.hs > @@@ -57,9 -52,6 +52,7 @@@ import Ganeti.ConfigReade > import Ganeti.Hash > import Ganeti.Logging > import qualified Ganeti.Constants as C > - import qualified Ganeti.Path as Path > - import Ganeti.Query.Server (prepQueryD, runQueryD) > +import qualified Ganeti.Query.Cluster as QCluster > import Ganeti.Utils > > -- * Types and constants definitions > LGTM, thanks. Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
