Merge branch 'stable-2.8' into master
authorKlaus Aehlig <aehlig@google.com>
Thu, 20 Jun 2013 11:38:28 +0000 (13:38 +0200)
committerKlaus Aehlig <aehlig@google.com>
Thu, 20 Jun 2013 11:46:27 +0000 (13:46 +0200)
commit0cac64ac45cfa6c90cc061b24c92a39333f2e362
tree77333bb0e677a0a7bf352358d29ea31839592a73
parent2c4f480d5cb7badd77af84d527edc2201d19db08
parent91cdc18f1e908b2ac5cc95dc8f7af3365fb0b6d5
Merge branch 'stable-2.8' into master

* stable-2.8
  In tiered allocation, cut non-promising shrinking tries
  Add confd user to masterd group

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>
src/Ganeti/HTools/Cluster.hs