LGTM, thanks
On Wed, Jul 17, 2013 at 5:14 PM, Klaus Aehlig <[email protected]> wrote: > > > commit e29123647c46a96787007d0d261c641280792725 > 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"; > > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores >
