commit 79b4c2b472ab8acb23ba3c1b9bbc22f9e8de74f7
Merge: acad545 e41d5a2
Author: Bernardo Dal Seno <bdals...@google.com>
Date: Fri May 31 14:04:27 2013 +0200
Merge branch 'stable-2.8' into master
* stable-2.8:
Document users-setup tool
Adjusting permissions after confd start
Ensure the queue socket has the right permissions
Update IAllocator interface documentation
Add NEWS entry for hail honoring networks
Add tests for network-aware allocation
Honor network connections in hail
Parse NIC data from allocation request in hail
Support group networks in Text backend
Parse node group networks
Update IAllocator interface documentation
Export connected networks to IAllocator
Re-activate previously active disks in watcher
Make the disks_active flag queryable
Consider disks_active in UpgradeConfig
Add disks_active to configuration
Fix release of instances in QA
Conflicts:
tools/cfgupgrade
tools/cfgupgrade was modified in stable-2.8 to remove a new parameter when
downgrading to 2.7, but this shouldn't go into the 2.9 version of
cfgupgrade.
diff --cc test/data/htools/unique-reboot-order.data
index 6aed729,7007aee..ece9986
--- a/test/data/htools/unique-reboot-order.data
+++ b/test/data/htools/unique-reboot-order.data
@@@ -1,8 -1,8 +1,8 @@@
- group-01|fake-uuid-01|preferred|
+ group-01|fake-uuid-01|preferred||
-node-01-001|91552|0|91424|953674|953674|16|M|fake-uuid-01|1
-node-01-002|91552|0|91296|953674|953674|16|N|fake-uuid-01|1
-node-01-003|91552|0|91296|953674|953674|16|N|fake-uuid-01|1
+node-01-001|91552|0|91424|3500|1196|16|M|fake-uuid-01|1
+node-01-002|91552|0|91296|3500|1196|16|N|fake-uuid-01|1
+node-01-003|91552|0|91296|3500|1196|16|N|fake-uuid-01|1
new-0|128|1152|1|running|Y|node-01-001|node-01-002|drbd||1
new-1|128|1152|1|running|Y|node-01-002|node-01-003|drbd||1
---
Note that this merge goes on top of the fix for the NEWS file that
I've just sent (otherwise, one more conflict results).
Bernardo
