On Thu, Sep 12, 2013 at 2:18 PM, Klaus Aehlig <[email protected]> wrote:
> On Thu, Sep 12, 2013 at 02:11:04PM +0200, Thomas Thrainer wrote: > > commit 77b5beac372ad8c436e17b6b92c20d21e0e0bfd5 > > Merge: 191e5c1 b2e7599 > > Author: Thomas Thrainer <[email protected]> > > Date: Thu Sep 12 13:23:29 2013 +0200 > > > > Merge branch 'stable-2.9' into master > > > > * stable-2.9 > > Make tools/users-setup explain its actions first > > Generate tools/users-setup from descriptions > > Provide ganeti user and group data in easy-to-parse form > > Fix bridging in net-common > > Remove dsahostkeypub during config downgrade > > Mark the DSA host pubkey as optional > > Sync build_chroot with buildbot slack role > > Auto-upgrade of disks' config wrt LD-renaming > > Fix tests regarding DISK_LD_DEFAULTS > > Fixing renaming of DISK_LD_DEFAULTS > > Fix documentation for gnt-node evacuate -p option > > Replace LD_* constants with DT_* constants > > QA: fix file storage QA wrt ipolicy > > Bump versions to release 2.9~beta1 > > Add design-2.9 to docinput > > NEWS update and version bump for 2.8 rc2 > > Lint improvements to regexps > > Add unit test for GetLinuxNodeInfo > > Prepare GetLinuxNodeInfo for testing > > Check right disk template in inst set params > > Make the DRBD collector more failure-resilient > > Add function to unwrap Results logging failures > > Fix bug in NodeD and RapiD usage strings > > Please also mention the changes pulled in from stable-2.8 > > FYI: Changed to Merge branch 'stable-2.9' into master * stable-2.9 Fix bridging in net-common Sync build_chroot with buildbot slack role Auto-upgrade of disks' config wrt LD-renaming Fix tests regarding DISK_LD_DEFAULTS Fixing renaming of DISK_LD_DEFAULTS Replace LD_* constants with DT_* constants QA: fix file storage QA wrt ipolicy Bump versions to release 2.9~beta1 Add design-2.9 to docinput NEWS update and version bump for 2.8 rc2 Lint improvements to regexps Add unit test for GetLinuxNodeInfo Prepare GetLinuxNodeInfo for testing Check right disk template in inst set params Make the DRBD collector more failure-resilient Add function to unwrap Results logging failures Fix bug in NodeD and RapiD usage strings * stable-2.8 Make tools/users-setup explain its actions first Generate tools/users-setup from descriptions Provide ganeti user and group data in easy-to-parse form Remove dsahostkeypub during config downgrade Mark the DSA host pubkey as optional Fix documentation for gnt-node evacuate -p option > > > > Conflicts: > > Makefile.am (trivial) > > devel/build_chroot (took changes from 2.9 but newer regex-pcre > > version) > > lib/cmdlib/cluster.py (followed LD_* -> DT_* change) > > lib/objects.py (followed LD_* -> DT_* change) > > test/py/ganeti.cmdlib_unittest.py (followed LD_* -> DT_* change) > > > > The LD_* -> DT_* change required some more changes in the cmdlib unit > > tests. > > > > Signed-off-by: Thomas Thrainer <[email protected]> > > > > Rest LGTM > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores > -- Thomas Thrainer | Software Engineer | [email protected] | 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
