On 5/24/11 6:10 AM, Tom Eastep wrote:
> On 5/24/11 2:40 AM, Ed W wrote:
>> On 23/05/2011 22:39, Tom Eastep wrote:
> 
>> Hi Tom, Could you look over the usage of "run", "runit" and I think
>> there is also a couple of "$cmd" that show if you do a simple diff
>> shorewall{,6}
>>
>> I'm sure I can figure it out, but presumably you have the answer at your
>> fingertips as to which way to merge the changes?  Modify to look like
>> shorewall6? (or is the call change more subtle?)
> 
> Hi Ed,
> 
> I've done quite a bit of merging but haven't tested it well enough yet
> to commit my work. I'll try to do that in the next hour or so.

If you do a 'pull origin master', you should see that the two files are
now very similar.

-Tom
-- 
Tom Eastep        \ When I die, I want to go like my Grandfather who
Shoreline,         \ died peacefully in his sleep. Not screaming like
Washington, USA     \ all of the passengers in his car
http://shorewall.net \________________________________________________

Attachment: signature.asc
Description: OpenPGP digital signature

------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Shorewall-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-users

Reply via email to