On Sat, Apr 28, 2012 at 7:54 PM, Ask Bjørn Hansen <a...@develooper.com>wrote:
> On Apr 28, 2012, at 13:41, Robert Spier <rsp...@pobox.com> wrote: > > > One thing that would help is if you could split your changes into > multiple > > pull requests -- if we're going to try using github as our mechanism, > every > > pull request should be for one "feature". There's a lot of your changes > > pending right now which are no-brainers. Typo fixes or other cleanups -- > > but to apply those without everything else in your tree requires a > > cherry-pick, which IIRC will wreak havoc with your tree when you try to > > rebase. (Or maybe not, and I should just start picking and getting the > > easy ones out of the way so we can focus on the others.) > > Rebasing after cherry-picking should work fine to clear up all the little > obvious commits. > > Done. I've gone through all the pending patches in the msimerson/master tree and committed all the low hanging fruit: * 38c7435 (HEAD, origin/master, origin/HEAD, master) prepend auth_flat plugin name to $note * 651ca98 don't print GeoIP country if not defined * 005c4d9 make sure $hook is defined before printing it * 821b182 fixed spelling error, added spf code to notes * 4bff5de added tls comments to config/plugins * 91d3f2a added comments to logging config files * 5dfc90a fixed POD formatting * dfeb835 improve grammar, update logging instructions * 1f36a24 bump RAM from 50 to 75MB * 1701406 suppress log error when $user unset * 2591d57 updated URL to new github repo Please rebase your tree and consider splitting some of these things into feature branches. (there are a few obvious ones, like the spamassassin improvements, ditto for dspam and greylisting, and one for the pod cleanups.) If it's a feature branch, we can just merge the branch as one commit. (And there's actually a way for you to present some of the changes that way.)
