On Tue, Dec 21, 2010 at 8:26 PM, James Cammarata <sngx-ad...@sngx.net> wrote: >>> I should be able to merge our work together without too much of an issue. >> >> If you are cool with the additional work, I'm fine with that. Thanks much. > > Don't mind at all, working on merging it now. Chuck's tree merged in > cleanly with mine actually, so it's just a matter of diffing our files > and reconciling the little differences here and there. I'm actually > done with merging his ubuntu module in with mine, doing debian next. >
Actually, done with that :) The diffs were 99% superficial, just differences between debian/ubuntu mostly. Testing now, I'll push to github when I'm done. _______________________________________________ cobbler-devel mailing list cobbler-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/cobbler-devel
