On Tue, Aug 27, 2013 at 1:06 PM, Klaus Aehlig <[email protected]> wrote: > > > commit a9257c9657ef3c7a2d5ec517057e8274f6c071eb > Merge: 78f99ab 0865101 > Author: Klaus Aehlig <[email protected]> > Date: Tue Aug 27 13:02:07 2013 +0200 > > 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. >
LGTM Thanks, Guido
