Obquote: What could possibly go wrong?
commit 5f476670d7c33342112274fe808171f794705987
Merge: 8bc9e04 71a24f8
Author: Iustin Pop <[email protected]>
Date: Thu Mar 17 16:47:06 2011 +0100
Merge remote branch 'htools/master'
* htools/master: (605 commits)
Update NEWS file for version 0.3.1
Update copyright years in the man pages
Remove obsolete env vars from the manpages
Fix dist archive generation
luxi backend: show attribute names in errors
Update exit code information in the hbal man page
Fix broken hscolour.css symlink in tarball
Update NEWS file for the 0.3.0 release
Remove an obsolete TODO
Update live-test.sh w.r.t. simulation mode changes
Prevent allocation on unallocable node groups
Fix bug in simulation backend
Precompute allocation nodes
Change the AllocNodes type and functions
Extract node pair generation from tryAlloc
tryAlloc: restrict valid node pairs to same-group
Cluster.hs: add a new type alias
Rapi: read and use the vm_capable node flag
IAllocator: read and use the vm_capable node flag
IAllocator: replace fake policy with real one
...
Note: done via the following sequence of commands:
git checkout master && git pull
git remote add htools git://git.ganeti.org/htools.git
git remote update
git merge -s recursive -X subtree=htools htools/master
diff --cc htools/.gitattributes
index 0000000,8253128..8253128
mode 000000,100644..100644
--- a/htools/.gitattributes
+++ b/htools/.gitattributes
diff --cc htools/.gitignore
index 0000000,9f0bb6b..9f0bb6b
mode 000000,100644..100644
--- a/htools/.gitignore
+++ b/htools/.gitignore
diff --cc htools/AUTHORS
index 0000000,1805e5b..1805e5b
mode 000000,100644..100644
--- a/htools/AUTHORS
+++ b/htools/AUTHORS
diff --cc htools/COPYING
index 0000000,d511905..d511905
mode 000000,100644..100644
--- a/htools/COPYING
+++ b/htools/COPYING
diff --cc htools/Ganeti/HTools/CLI.hs
index 0000000,b000a00..b000a00
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/CLI.hs
+++ b/htools/Ganeti/HTools/CLI.hs
diff --cc htools/Ganeti/HTools/Cluster.hs
index 0000000,68ea006..68ea006
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Cluster.hs
+++ b/htools/Ganeti/HTools/Cluster.hs
diff --cc htools/Ganeti/HTools/Container.hs
index 0000000,12d1978..12d1978
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Container.hs
+++ b/htools/Ganeti/HTools/Container.hs
diff --cc htools/Ganeti/HTools/ExtLoader.hs
index 0000000,0412c1b..0412c1b
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/ExtLoader.hs
+++ b/htools/Ganeti/HTools/ExtLoader.hs
diff --cc htools/Ganeti/HTools/Group.hs
index 0000000,b8afba8..b8afba8
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Group.hs
+++ b/htools/Ganeti/HTools/Group.hs
diff --cc htools/Ganeti/HTools/IAlloc.hs
index 0000000,4812b8e..4812b8e
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/IAlloc.hs
+++ b/htools/Ganeti/HTools/IAlloc.hs
diff --cc htools/Ganeti/HTools/Instance.hs
index 0000000,2741398..2741398
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Instance.hs
+++ b/htools/Ganeti/HTools/Instance.hs
diff --cc htools/Ganeti/HTools/Loader.hs
index 0000000,c17aba1..c17aba1
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Loader.hs
+++ b/htools/Ganeti/HTools/Loader.hs
diff --cc htools/Ganeti/HTools/Luxi.hs
index 0000000,0fbd798..0fbd798
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Luxi.hs
+++ b/htools/Ganeti/HTools/Luxi.hs
diff --cc htools/Ganeti/HTools/Node.hs
index 0000000,0384923..0384923
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Node.hs
+++ b/htools/Ganeti/HTools/Node.hs
diff --cc htools/Ganeti/HTools/PeerMap.hs
index 0000000,d7c6440..d7c6440
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/PeerMap.hs
+++ b/htools/Ganeti/HTools/PeerMap.hs
diff --cc htools/Ganeti/HTools/QC.hs
index 0000000,534a7b1..534a7b1
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/QC.hs
+++ b/htools/Ganeti/HTools/QC.hs
diff --cc htools/Ganeti/HTools/Rapi.hs
index 0000000,eb30076..eb30076
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Rapi.hs
+++ b/htools/Ganeti/HTools/Rapi.hs
diff --cc htools/Ganeti/HTools/Simu.hs
index 0000000,a763076..a763076
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Simu.hs
+++ b/htools/Ganeti/HTools/Simu.hs
diff --cc htools/Ganeti/HTools/Text.hs
index 0000000,1f446ac..1f446ac
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Text.hs
+++ b/htools/Ganeti/HTools/Text.hs
diff --cc htools/Ganeti/HTools/Types.hs
index 0000000,104bf64..104bf64
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Types.hs
+++ b/htools/Ganeti/HTools/Types.hs
diff --cc htools/Ganeti/HTools/Utils.hs
index 0000000,6317f98..6317f98
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Utils.hs
+++ b/htools/Ganeti/HTools/Utils.hs
diff --cc htools/Ganeti/HTools/Version.hs.in
index 0000000,3785e91..3785e91
mode 000000,100644..100644
--- a/htools/Ganeti/HTools/Version.hs.in
+++ b/htools/Ganeti/HTools/Version.hs.in
diff --cc htools/Ganeti/Jobs.hs
index 0000000,2eea120..2eea120
mode 000000,100644..100644
--- a/htools/Ganeti/Jobs.hs
+++ b/htools/Ganeti/Jobs.hs
diff --cc htools/Ganeti/Luxi.hs
index 0000000,56024a5..56024a5
mode 000000,100644..100644
--- a/htools/Ganeti/Luxi.hs
+++ b/htools/Ganeti/Luxi.hs
diff --cc htools/Ganeti/OpCodes.hs
index 0000000,972a2dc..972a2dc
mode 000000,100644..100644
--- a/htools/Ganeti/OpCodes.hs
+++ b/htools/Ganeti/OpCodes.hs
diff --cc htools/Makefile
index 0000000,c02decb..c02decb
mode 000000,100644..100644
--- a/htools/Makefile
+++ b/htools/Makefile
diff --cc htools/NEWS
index 0000000,a0d3ad1..a0d3ad1
mode 000000,100644..100644
--- a/htools/NEWS
+++ b/htools/NEWS
diff --cc htools/README
index 0000000,cb7f611..cb7f611
mode 000000,100644..100644
--- a/htools/README
+++ b/htools/README
diff --cc htools/doc/design-ganeti-2.3.rst
index 0000000,a6beabd..a6beabd
mode 000000,100644..100644
--- a/htools/doc/design-ganeti-2.3.rst
+++ b/htools/doc/design-ganeti-2.3.rst
diff --cc htools/haddock-prologue
index 0000000,5e156d8..5e156d8
mode 000000,100644..100644
--- a/htools/haddock-prologue
+++ b/htools/haddock-prologue
diff --cc htools/hail.hs
index 0000000,541e1a9..541e1a9
mode 000000,100644..100644
--- a/htools/hail.hs
+++ b/htools/hail.hs
diff --cc htools/hbal.hs
index 0000000,46cccf8..46cccf8
mode 000000,100644..100644
--- a/htools/hbal.hs
+++ b/htools/hbal.hs
diff --cc htools/hscan.hs
index 0000000,c14846f..c14846f
mode 000000,100644..100644
--- a/htools/hscan.hs
+++ b/htools/hscan.hs
diff --cc htools/hspace.hs
index 0000000,57d0302..57d0302
mode 000000,100644..100644
--- a/htools/hspace.hs
+++ b/htools/hspace.hs
diff --cc htools/live-test.sh
index 0000000,c059bbd..c059bbd
mode 000000,100755..100755
--- a/htools/live-test.sh
+++ b/htools/live-test.sh
diff --cc htools/man/hail.rst
index 0000000,22c228a..22c228a
mode 000000,100644..100644
--- a/htools/man/hail.rst
+++ b/htools/man/hail.rst
diff --cc htools/man/hbal.rst
index 0000000,a63ab90..a63ab90
mode 000000,100644..100644
--- a/htools/man/hbal.rst
+++ b/htools/man/hbal.rst
diff --cc htools/man/hscan.rst
index 0000000,497c96c..497c96c
mode 000000,100644..100644
--- a/htools/man/hscan.rst
+++ b/htools/man/hscan.rst
diff --cc htools/man/hspace.rst
index 0000000,08095b5..08095b5
mode 000000,100644..100644
--- a/htools/man/hspace.rst
+++ b/htools/man/hspace.rst
diff --cc htools/test.hs
index 0000000,12aa50d..12aa50d
mode 000000,100644..100644
--- a/htools/test.hs
+++ b/htools/test.hs
--
thanks,
iustin
