If it's just a refactoring it against master, while if it fixes a clear bug that can be reproduced in a stable version it should go into that stable branch. If it fixes something that "seems" wrong but you can't point it to anything specific at most you can send it against the latest rc/beta branch, but not against the stable ones.
Thanks, Guido On 11 Nov 2013 16:36, "Santi Raffa" <[email protected]> wrote: > Hello, > > In the development of Gluster support in Ganeti I've developed a few > general code-health commits. Some of those changed were prompted by > test failures, some of those accomodate future development without > bringing actual change in the immediate, some of those just fix code > smells. There's no reason to hold them back until gluster support is > ready to ship, so I'd like to send them out now. > > I am left with the quandary of what branch to apply those changes to. > I've only tested them against master, but for some of those you could > make the argument that they fix bugs and thus should go against the > earliest possible branch. > > The commits I'm looking at are, in no particular order: > > > https://github.com/badp/ganeti/commit/237573b7a3a5827cf53e2ea02a554ab93edfe8d4 > ComputeLDParams: do not spell out disk templates without params (last > changed in... 2.9?) > What I think: this should go against master (Gluster starts through my > patch series as a disk template without parameters, so that's the only > time where any code would benefit from this change) > > > https://github.com/badp/ganeti/commit/1a324a19cd6002559531e2ca79a810218d498881 > Remove hardcoded references to File and SharedFile templates > (cherry-picks without conflicts on 2.10, but not on 2.9) > What I think: again, this is only a problem once I introduce gluster > as the third file based template in Ganeti, but if it cherry-picks > against 2.10 cleanly I have no strong feelings either way. > > > https://github.com/badp/ganeti/commit/cd2054461d75f9645b164744415818e5b798efa4 > FillDict: do not use exceptions for flow control (last changed in 2.1) > What I think: this is not really a bug, although a function called > about 56 times could probably use some love. This should go against > master. > > > https://github.com/badp/ganeti/commit/9e4c97dbc8ae417edb96de2d57fae3ea325f3733 > ThrowError: Improve exception logging (last changed in 2.9) > What I think: any version can benefit from better logging and the > earliest the merrier. > > > https://github.com/badp/ganeti/commit/faadb05d1f53ad72b1ccd47f2f946eef77faf07f > Fix docstring for ganeti.storage.filestorage_unittest.py (last changed in > 2.9) > What I think: this is the closest to being an actual bug fix and is > probably better targeted on 2.9 > > Thoughts? > > -- > Raffa Santi > 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 >
