Revision 866e1f76
| ID | 866e1f769e82970c5ee896c3db1973908a4727a8 |
| Parent | 89922d01, c2a97cee |
| Child | 3648dad3, 3b86a503 |
Merge branch 'stable-2.10' into stable-2.11
- stable-2.10
Test parallel instance ops and plain instances
Test parallel creation of DRBD instances
Test parallel job submission performance
Test parallel instance query operations
Test parallel instance operations
Test parallel instance modification
Test parallel node-count instance creation
Test parallel instance creation and removal
Fail in replace-disks if attaching disks fails
Add a basic test for --restricted-migration
Describe the --restricted-migration option
Support restricted migration
Add an option for restricted migration
Add an example for node evacuation
Add a test for parsing version strings
- stable-2.9
KVM: set IFF_ONE_QUEUE on created tap interfaces
Add configure option to pass GHC flags
Conflicts:
Makefile.am
configure.ac
qa/qa_utils.py
Resolution:
Take ALL the additions
Semantical conflict:
make hsqueeze use the modified tryBalance signature
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Petr Pudlak <pudlak@google.com>
Files
- added
- modified
- copied
- renamed
- deleted