Revision d6f38e24
| ID | d6f38e241ec64dbfe5d88a94c4602068e7e92f32 |
| Parent | c1795848, 5d863fad |
| Child | 239826ef |
Merge branch 'stable-2.11' into master
- stable-2.11
Make GlusterFS tests dual-stack-aware
Moving release date of 2.11.0 to 25th of April
Revision bump for 2.11.0
Prepare NEWS file for release of 2.11.0
Fix Xen instance state
- stable-2.10
Fix failed DRBD disk creation cleanup
Fix lint errors introduced during cherry-pick
Hooking up verification for shared file storage
Fix --shared-file-storage-dir option of gnt-cluster modify
Clarify default setting of 'metavg'
Fix invocation of GetCommandOutput in QA
Clean up RunWithLocks
Add an exception-trapping thread class
Wait for delay to provide interruption information
Add an expected block option to RunWithLocks
Track if a QA test was blocked by locks
Add a RunWithLocks QA utility function
- stable-2.9
If Automake version > 1.11, force serial tests
Conflicts:
NEWS: take all additions
configure.ac: ignore suffix bump
lib/client/gnt_cluster.py: union of additions
lib/cmdlib/cluster.py: union of additions
lib/hypervisor/hv_xen.py: union of additions
qa/qa_job_utils.py: take version of master
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>
Files
- added
- modified
- copied
- renamed
- deleted