Revision f148fe23
| ID | f148fe239e9bb23613b3dca447b396a1e1231569 |
| Parent | 78f99abb, 0865101d |
| Child | 036744e2 |
Merge branch 'stable-2.8' into stable-2.9
- stable-2.8
Add function to unwrap Results logging failures
Make the DRBD collector more failure-resilient
Prepare GetLinuxNodeInfo for testing
Add unit test for GetLinuxNodeInfo
NEWS update and version bump for 2.8 rc2
Conflicts:
Makefile.am
NEWS
configure.ac
lib/hypervisor/hv_base.py
For hv_base.py, take the changes of stable-2.8, for
configure.ac take the version of stable-2.9, for the
rest, take both additions.
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
Files
- added
- modified
- copied
- renamed
- deleted