On Wed, Oct 30, 2013 at 1:37 PM, Klaus Aehlig <[email protected]> wrote: > > commit 0c4d24d535e9bcf482e24c582b078f98f7374b40 > Merge: 0be5f29 7e36026 > Author: Klaus Aehlig <[email protected]> > Date: Wed Oct 30 13:33:58 2013 +0100 > > Merge branch 'stable-2.8' into stable-2.9 > > * stable-2.8 > Add all dependencies for confd as test dependencies > Add snap-server to the test-relevenat packages > Placate warnings on ganeti.outils_unittest.py > > Conflicts: > configure.ac: take both additions (and fix) > > Singed-off-by: Klaus Aehlig <[email protected]> > > diff --cc configure.ac > index bad73ba,0b73e5e..8aa43d3 > --- a/configure.ac > +++ b/configure.ac > @@@ -576,8 -623,11 +576,12 @@@ AC_GHC_PKG_CHECK([temporary], [], [HS_N > # of the checks. > AC_GHC_PKG_CHECK([attoparsec], [], [HS_NODEV=1]) > AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1]) > - AC_GHC_PKG_CHECK([process], [], > - [MONITORING_PKG="$MONITORING_PKG process"]) > ++AC_GHC_PKG_CHECK([process], [], [HS_NODEV=1]) > + AC_GHC_PKG_CHECK([snap-server], [], [HS_NODEV=1]) > + AC_GHC_PKG_CHECK([regex-pcre], [], [HS_NODEV=1]) > + AC_GHC_PKG_CHECK([Crypto], [], [HS_NODEV=1]) > + AC_GHC_PKG_CHECK([text], [], [HS_NODEV=1]) > + AC_GHC_PKG_CHECK([hinotify], [], [HS_NODEV=1]) > if test -n "$HS_NODEV"; then > AC_MSG_WARN(m4_normalize([Required development modules were not found, > you won't be able to run Haskell unittests])) > > > -- > 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
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
