LGTM, thanks!
On Mon, Feb 24, 2014 at 4:42 PM, Klaus Aehlig <[email protected]> wrote: > > > commit 623c64ed606c3b67954422623e610796c3a76a0d > Merge: 77dac68 ead368b > Author: Klaus Aehlig <[email protected]> > Date: Mon Feb 24 16:14:34 2014 +0100 > > Merge branch 'stable-2.11' into master > > * stable-2.10 > Let the instance's tuple of nodes start with the primary > Fix the test that checks for the order of instance's nodes > Revision bump for the 2.10.0 release > Update NEWS file for 2.10.0 > Revision bump for 2.10.0~rc3 > Update NEWS file for 2.10.0~rc3 > > * stable-2.9 > Fix net-common script in case of routed mode > Document hspace's SPN parameters > Document spindles in TSPEC > man: Update the manual page of gnt-node FAILOVER > Make hbal deal with no-LVM storage space properly > > * stable-2.8 > Fix expression describing optional parameters > Improve job status assert affected by race condition > Export and import Disk/NIC name > Fix backup import in case NIC is inside a network > Override get() method of ConfigParser > Fix integer overflow problem in hbal > Add missing space > > Conflicts: > Makefile.am: manually apply 438ce535 on > the stable-2.11 version > > diff --cc Makefile.am > index e10204d,1125b2f..ef43fea > --- a/Makefile.am > +++ b/Makefile.am > @@@ -1029,26 -1012,36 +1052,36 @@@ install-exec-hook > $(LN_S) -f htools $(DESTDIR)$(bindir)/$$role ; \ > done > > - HNORMAL_SUFFIX = .o > - HPROFILE_SUFFIX = .prof.o > - HCOVERAGE_SUFFIX = .hpc.o > - HTEST_SUFFIX = .test.o > + HS_SRCS = $(HS_LIBTESTBUILT_SRCS) > > - HSUFFIX = $(if $(HPROFILE),$(HPROFILE_SUFFIX), \ > - $(if $(HCOVERAGE),$(HCOVERAGE_SUFFIX), \ > - $(if $(HTEST),$(HTEST_SUFFIX), \ > - $(HNORMAL_SUFFIX)))) > + Makefile.ghc: $(HS_ALL_PROGS:%=%.hs) $(HS_SRCS) Makefile | > $(built_base_sources) > + $(GHC) -M -dep-makefile $@ -dep-suffix $(HTEST_SUFFIX) $(HFLAGS) \ > + $(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA) > $(HS_ALL_PROGS:%=%.hs) $(HS_SRCS) > > - HFLAGS += $(if $(HPROFILE),-prof -auto-all,) > - HFLAGS += $(if $(HCOVERAGE),-fhpc,) > - HFLAGS += $(if $(HTEST),-DTEST,) > + @include_makefile_ghc@ > > - HS_SRCS = $(HS_LIBTESTBUILT_SRCS) > + %.o: > + @echo '[GHC]: $@ <- $^' > + @$(GHC) -c $(HFLAGS) \ > + $(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA) $(@:%.o=%.hs) > + > + %.$(HTEST_SUFFIX)_o: > + @echo '[GHC]: $@ <- $^' > + @$(GHC) -c $(HTEST_FLAGS) \ > + $(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA) > $(@:%.$(HTEST_SUFFIX)_o=%.hs) > > - .NOTPARALLEL: $(HS_ALL_PROGS) > - .PHONY: $(HS_ALL_PROGS) > - $(HS_ALL_PROGS): %: %.hs $(HS_SRCS) Makefile > - @if [ "$(notdir $@)" = "test" ] && [ "$(HS_NODEV)" ]; then \ > + %.hi: %.o ; > + %.$(HTEST_SUFFIX)_hi: %.$(HTEST_SUFFIX)_o ; > + > + $(HS_SRC_PROGS): %: %.o | stamp-directories > + $(GHC) $(HFLAGS) \ > + $(HS_PARALLEL3) $(HS_REGEX_PCRE) $(HEXTRA) --make > $(@:%=%.hs) > + @rm -f $(notdir $@).tix > + @touch "$@" > + > + $(HS_TEST_PROGS): %: %.$(HTEST_SUFFIX)_o \ > - | stamp-directories $(BUILT_PYTHON_SOURCES) > ++ | stamp-directories $(built_python_sources) > + @if [ "$(HS_NODEV)" ]; then \ > echo "Error: cannot run unittests without the development" \ > " libraries (see devnotes.rst)" 1>&2; \ > exit 1; \ > diff --cc NEWS > index 833de14,9d96a74..e0a6542 > --- a/NEWS > +++ b/NEWS > @@@ -89,13 -60,11 +89,13 @@@ For Haskell > - ``base64-bytestring`` library (http://hackage.haskell.org/package/zlib > ), > at least version 1.0.0.0 > > +- ``lifted-base`` library ( > http://hackage.haskell.org/package/lifted-base) > + > > - Version 2.10.0 rc2 > - ------------------ > + Version 2.10.0 > + -------------- > > - *(Released Fri, 31 Jan 2014)* > + *(Released Thu, 20 Feb 2014)* > > Incompatible/important changes > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > diff --cc configure.ac > index d7301b1,f50fb07..db75c04 > --- a/configure.ac > +++ b/configure.ac > @@@ -225,12 -273,10 +273,12 @@@ AC_ARG_WITH([user-prefix] > [ to change the default)] > )], > [user_masterd="${withval}masterd"; > + user_metad="${withval}metad"; > user_rapi="${withval}rapi"; > user_confd="${withval}confd"; > + user_wconfd="${withval}wconfd"; > user_kvmd="$user_default"; > - user_luxid="${withval}luxid"; > + user_luxid="${withval}masterd"; > user_noded="$user_default"; > user_mond="$user_default"], > [user_masterd="$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 >
