Jasper Capel wrote: > Jasper Capel wrote: > >> Hey, >> >> I think I might have forgotten to send this patch to the ML: >> >> Could this one be included for 1.4.3 please (branch master-bugs, >> git://bender.newnewyork.nl/cobbler)? >> https://bender.newnewyork.nl/git/gitweb.cgi?p=cobbler/.git;a=commit;h=a4faf0cab2a2f15fbbde183773441ff0c7331d81 >> >> > > As Dave Hatton pointed out on IRC, this re-breaks DNS enumeration stuff > (it appears I was working on an old branch at that time), so I reapplied it: > https://bender.newnewyork.nl/git/gitweb.cgi?p=cobbler/.git;a=commit;h=64ed5d14ae9b93e78fd7f6997ddb5079ed0afb4b > > If this is too much of a hassle, I can rebase it, but that'll have to > wait till later this week then. > > -Jasper > _______________________________________________ > cobbler mailing list > [email protected] > https://fedorahosted.org/mailman/listinfo/cobbler >
Applied to devel and master branches, thanks. Apparently git is a little annoyed with trying to cherry-pick external content, so if you really want to, you can cherry-pick your own commits between your master and devel branches, then I could just do a couple of merges. Not important though, it's settled :) --Michael _______________________________________________ cobbler mailing list [email protected] https://fedorahosted.org/mailman/listinfo/cobbler
