On Thu, Oct 17, 2013 at 1:49 PM, Klaus Aehlig <[email protected]> wrote: > > > commit 8dff15b432af5fad816b7a8b7e72f86fb3ac48c5 > Merge: 71ae80d 39d36a5 > Author: Klaus Aehlig <[email protected]> > Date: Thu Oct 17 13:43:34 2013 +0200 > > Merge branch 'stable-2.8' into stable-2.9 > > * stable-2.8 > Version bump for 2.8.1 > Verify that ConfD is running after master-failover > daemon-util: handle luxid in {start,stop}_master() > Fix typo in storage.FileStorage docstring > Fix path for serial file > > Conflicts: > NEWS: take both changes > configure.ac: ignore version bump > lib/bdev.py: apply change to lib/storage/bdev.py > > Signed-off-by: Klaus Aehlig <[email protected]> >
LGTM, thanks. Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
