[vyatta-svn] xorp: Changes to 'alameda'

Wed Jan 17 14:38:24 PST 2007

New branch 'alameda' available with the following commits:
commit 77c564f8a02db0553dce2d0f6f0b821717615157
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 17 12:02:53 2007 -0800

    Split out libbasic.

commit e48bf96e7bbeb2971204cbaaa92c199dba37812d
Merge: 13013971cae5ffb2242f2bff13f69aba58d5f39d b9d70bacb63b7a7b48839da99742700863ce1a2c
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 16 17:37:32 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 13013971cae5ffb2242f2bff13f69aba58d5f39d
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 16 17:36:41 2007 -0800

    Add range limits and sort proposal numbers

commit b9d70bacb63b7a7b48839da99742700863ce1a2c
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 16 16:49:08 2007 -0800

    Removed stale rl_xg/Makefile.am-OLD

commit d4ba37fd2be5239afe8c8d1fff7c03f52a2aac5c
Merge: 3903bf2f467207adeeb6e13607d999b7a19f52d4 3bac28ae3278a2927a255fe25aebe12dd54cbac4
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 16 16:47:13 2007 -0800

    Merge branch 'master' of marat at phuket:/usr/local/git/vyattacli

commit 3903bf2f467207adeeb6e13607d999b7a19f52d4
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 16 16:46:46 2007 -0800

    Sorted rl_xg/include.am

commit 3bac28ae3278a2927a255fe25aebe12dd54cbac4
Merge: 102d68ef268962cf822882a2d5d73f43f13dad9e 5322b414df054185071f3867cc9a66fdaee5ee4d
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 16 16:30:14 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 102d68ef268962cf822882a2d5d73f43f13dad9e
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 16 16:29:57 2007 -0800

    Add stricter group check
    Support top-level VPN configuration deletion

commit 729332085ff1efdef45dbff8004b682cd85277f6
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 16 16:28:26 2007 -0800

    Change subnet validation to ipv4net
    Create/delete directories to support section delete

commit 5322b414df054185071f3867cc9a66fdaee5ee4d
Merge: 90c5e1424aaa02c4d9be8a4a3f03f6e04c0c16aa 7070162e1f8e112537186c70d8447831a9a8b509
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 16 16:07:00 2007 -0800

    Merge branch 'origin' into working_vyattacli

commit 90c5e1424aaa02c4d9be8a4a3f03f6e04c0c16aa
Merge: c12a32c66806c4ef90df8acb15c42bdf2ba4445b d2b79083b31725c2c69cbc2dd8853cc067aef9bb
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 16 15:44:38 2007 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit d2b79083b31725c2c69cbc2dd8853cc067aef9bb
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 16 15:32:43 2007 -0800

    Moved rl_xg/xgcgi/basic_client.?? to rl_xg/basic_client/ to compile into library libbasicclient.la

commit 300f77d4e7f4a12527bc7135640331c7be40272c
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 16 11:04:07 2007 -0800

    Split out BasicErrorInfo.

commit 9b6e7048ddd58d4a7fe4b6785c132ac1b00c8ce3
Merge: e275a29184459e1e9e76b3af6dfd294438e18eaa b1275d56d77460ed2f057fd8df481c9a3ffaa3d6
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Mon Jan 15 17:44:28 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit e275a29184459e1e9e76b3af6dfd294438e18eaa
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Mon Jan 15 17:44:15 2007 -0800

    Add pluto debugging
    Correct ESP key lifetime

commit b1275d56d77460ed2f057fd8df481c9a3ffaa3d6
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 17:12:51 2007 -0800

    Split out basic_xgdaemon_client.??

commit 7919fd9a4d7a3ac38f7d7f23a9186de37b7c37d5
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 16:28:50 2007 -0800

    Renamed XGCGI in xgcgi2.cc to XGCGI2.

commit e4621049ed606acb59dd712aba0c826c46719a45
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 16:00:17 2007 -0800

    Now using BasicXGDaemonClient rather than XGDaemonClient in xgcgi2.

commit c025ac0d41f40872180e27259a21f9f56b34743b
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 15:57:53 2007 -0800

    Removed extraneous lines from rl_xg/include.am

commit d3a2b68a30266f1ee1026d699ebd23c20afb8cfb
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 15:44:12 2007 -0800

    Split out BasicXGDaemonClient

commit f9d0b2ab82f3768a9c53a2c87cb133ebbe6dd85d
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 15 14:35:29 2007 -0800

    Split out libcgi.la

commit c12a32c66806c4ef90df8acb15c42bdf2ba4445b
Merge: 4a6c61a41ca605a5137ffceeefb1e52c876d0c91 0442486a2530076eb88c6dc883ef5369f2e00815
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Jan 12 10:00:23 2007 -0800

    Merge branch 'origin' into working_vyattacli

commit 56fe67d26479bd7b417eccb89030660b655b5dbf
Merge: 06d5df5696b36db989b8477ed37ce04d0cd94294 507ed659826391630fc391b752aa37e9e688b085
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 11 18:10:56 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 06d5df5696b36db989b8477ed37ce04d0cd94294
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Jan 11 18:10:37 2007 -0800

    Provide explicit exit code for commit notification

commit 507ed659826391630fc391b752aa37e9e688b085
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Thu Jan 11 13:02:41 2007 -0800

    Updated template file etc/templates/rl_vpn.cmds with VPN operational commands.

commit f9c5693fbff97528ad624c0c36ece05591e381d8
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Thu Jan 11 12:50:33 2007 -0800

    Renamed vpn-specific xsl files show_*.xsl to show_vpn_*.xsl as requested.

commit 8ef540c6071bf78289e7c22e7a2ef7f9dcf5f91f
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Thu Jan 11 12:17:42 2007 -0800

    Added show_vpn_ipsec_status.xsl

commit 189537517e833218dcbf9f57cebde5d0e500eb49
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 10 18:16:27 2007 -0800

    Added show_ike_sa.xsl

commit 799ddb4f41a1b197e242e4beb8958424abda04e2
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 10 18:06:32 2007 -0800

    Updated comment to indicate correct module name.

commit c7502c786d6b5f892e87d64f53efbaba627e9a3e
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 10 18:00:03 2007 -0800

    Updated comment to indicate the correct command.

commit 01702491ad2f21701046dbf94e049f14d1ccd326
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 10 17:57:50 2007 -0800

    Added show_ipsec_sa.xsl

commit 47cf0a14b75cb6fd80963de73519ed78e8a39974
Author: Robert Bays <rbays at phuket.vyatta.com>
Date:   Wed Jan 10 17:55:16 2007 -0800

    fix for bug 1620: Create a method to preserve interface numbering information in config partition

commit e9a46a307b963aeda045acbed6feabf034a37c2d
Merge: a86bab1df2386c6609624360ff4aa8e60c61586d 2eaee1dda5c9fc58f517ea64b9f5eaad916a918d
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 16:40:16 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit a86bab1df2386c6609624360ff4aa8e60c61586d
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 16:39:54 2007 -0800

    Remove default value dh-group (optional)
    Comment out log-mode
    Change subnets to text type to support 'any'

commit ee2a80d25691ee6fe2d584684bcbbd8cb5869a59
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 16:28:32 2007 -0800

    Add configuration data to handle changes in tunnel configuration

commit 69c6e0c29645df1834bf6da2537438924ae22559
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 16:23:19 2007 -0800

    Correct conversion of %any

commit 2eaee1dda5c9fc58f517ea64b9f5eaad916a918d
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Wed Jan 10 15:40:00 2007 -0800

    Added show_ipsec_sa_statistics.xsl

commit e35508804c40ef1c740fee930a7ffd93d3408fa8
Merge: 9f482edb5bf8104a3706c3bb8b8baee29834fddf 6264b01fd127fb2726a7949fdb09140113a4ee32
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 12:35:50 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 9f482edb5bf8104a3706c3bb8b8baee29834fddf
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 10 12:35:33 2007 -0800

    Change VPN sha2 hash to sha2_256, sha2_384 and sha2_512.

commit 6264b01fd127fb2726a7949fdb09140113a4ee32
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Jan 9 18:07:38 2007 -0800

    Changed peer to peer_ip.

commit 4a6c61a41ca605a5137ffceeefb1e52c876d0c91
Merge: bd7344ea6de82e88a1a1b70b5c94f05e4f68b769 b38c003084b17e9300be293a53cff2d92a56e0d1
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 9 17:36:55 2007 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit bd7344ea6de82e88a1a1b70b5c94f05e4f68b769
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 9 17:35:39 2007 -0800

    Implementation of nested setkey structure--should have everything at this point, but lifetime.

commit b38c003084b17e9300be293a53cff2d92a56e0d1
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 9 17:22:27 2007 -0800

    Disable implicit VPN connections

commit c167d3e8759460ea06dfc076c1f9ab8b3fd209b6
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 9 16:30:21 2007 -0800

    Revise configuration print function

commit 2e88bb031046d1b8e27daed297bdf99707cb4a2a
Merge: 0adaad9fb9385b4f205969b7834c8f620a826ea5 af8e1ee98606a4a1de3aad4c5a4ad34982dce251
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 9 15:06:49 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 0adaad9fb9385b4f205969b7834c8f620a826ea5
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 9 15:06:42 2007 -0800

    Add (incomplete) logic to handle changes in tunnel configuration

commit af8e1ee98606a4a1de3aad4c5a4ad34982dce251
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Jan 9 10:35:38 2007 -0800

    Added interface validation into cmd processor for vpn output. also added dependency on the rlxorp library--will need to verify that this doesn't break some of the sablot functions as it did in the past.

commit 147aab20b10006024e3f2a8fe88d2615d3dbc954
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Jan 8 15:34:25 2007 -0800

    Additional fixes to rl_cmd_proc for vpn--added bytes and interfaces.

commit 8bf16d53fc471358cd89d685479d5c6361b0d864
Merge: 22b32575fbe15f68bc50bb5ccfc9646e2c1ffc03 8e2c781ff9631d552459498b17cbbf851bd34371
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 8 15:10:19 2007 -0800

    Merge branch 'master' of marat at phuket:/usr/local/git/vyattacli

commit 22b32575fbe15f68bc50bb5ccfc9646e2c1ffc03
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Mon Jan 8 15:09:53 2007 -0800

    Added show ike status XSL and command.

commit 8e2c781ff9631d552459498b17cbbf851bd34371
Merge: c8fd4116b0fd7ba076dcfea402eb45efd86b46b3 ffe40d6140b2ae27a2065740b5a58c12833cf3d2
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Jan 8 14:48:50 2007 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit c8fd4116b0fd7ba076dcfea402eb45efd86b46b3
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Jan 8 14:47:02 2007 -0800

    Updated xml processor for vpn commands--bug fixes to included additional fields.

commit ffe40d6140b2ae27a2065740b5a58c12833cf3d2
Merge: 934792b7f4bce6e72b530ea7fccc348f3fd0b81b 80611ad2b9ba54a44416ea30a213457c5175ad0b
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Mon Jan 8 14:36:45 2007 -0800

    Merge branch 'master' of /usr/local/git/vyattacli

commit 934792b7f4bce6e72b530ea7fccc348f3fd0b81b
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Mon Jan 8 14:36:38 2007 -0800

    Initial cut of VPN tunnel configuration

commit 80611ad2b9ba54a44416ea30a213457c5175ad0b
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Jan 8 11:45:38 2007 -0800

    Added support for parsing of netkey commands into intermediate xml format. Ready for initial xsl pass.

commit c37ff08b606228496f60ae61b5e2fb82bf09193f
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Mon Jan 8 11:27:06 2007 -0800

    Add tunnel interface configuration & help strings

commit 158e44bf48a43c1a89967abf208d138642925cc1
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Jan 5 10:17:40 2007 -0800

    Files also needed as part of the interfaces tunnel project.

commit 57bdcccaf8af7ec5964b031424db0e61820fd991
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Jan 5 10:15:49 2007 -0800

    added new vpn tunnel binary and template project

commit 132897a9b32c670bce5dbbad641852bb5a78996f
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Jan 4 13:23:22 2007 -0800

    check the return status instead of stderror failure.

commit 052e1d7b4bfdb5cc38ea4e83e76b7619bb9fa45c
Merge: d6bc6f5546ba8fd40b8a71d1d2070ec2b1b43f34 c3fab87428c01482eb19e48effe461bb6ff6cda5
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Jan 4 09:15:43 2007 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit d6bc6f5546ba8fd40b8a71d1d2070ec2b1b43f34
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Jan 4 09:13:43 2007 -0800

    Additional processing of vpn show commands, also added hook for program failure--will fail program on stderrfrom pgm.

commit c3fab87428c01482eb19e48effe461bb6ff6cda5
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 17:16:29 2007 -0800

    Add VPN configuration help strings

commit 541df0c8105412f2b2e8e2c416cfda5bfe391ce7
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 13:07:36 2007 -0800

    Add VPN operational commands template

commit 1b9aab980e14bcb785b2cd428f2131dfbdf3ab37
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 12:39:43 2007 -0800

    Add logging commands to Openswan configuration

commit 1dfd47e404468888e703a52a539b1a694dccd74f
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 11:38:05 2007 -0800

    Add VPN templates

commit 8a11ee6f45139e56c07ea86bfad42863f4fba310
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 11:09:40 2007 -0800

    Add VPN scripts to libexec/xorp

commit 82fe48296ef05d95efbe6137568f8accdf66b6bf
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 11:08:59 2007 -0800

    Use libexec/xorp for VPN scripts

commit 624404fe078d0a706e12c22da2403ad24b1b2df6
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Wed Jan 3 11:07:49 2007 -0800

    Correct full path to configuration directory
    Use libexec/xorp for VPN scripts

commit 976dcecf5ded8cae04d3f47b7910ea3b6013e3c3
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 2 12:09:29 2007 -0800

    Add vpn-commit to start or stop Openswan based on configuration and configuration validity

commit 30e1678eea89f2ad837b7f0c91b9081d5bb7e228
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 2 11:11:07 2007 -0800

    Change configuration directory and directory format
    Add basic VPN show command

commit 4a4423fe31ca90438446f2c78a0654e9430e43e3
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 2 11:07:33 2007 -0800

    Change configuration directory and Perl module location

commit 6a92dbf1c011a464230a5afddafe314ab875a144
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Tue Jan 2 07:46:28 2007 -0800

    Remove dash from aes-128 and aes-256 to match Openswan configuration

commit f92d252c3a17ef91b07d66791fbb0761b9cd8af4
Merge: a732df8670208b4cbf5cd5a132d8c6a0ee2a70f4 5475f3fb81aa869cc330ee3b9125bf3fa22bc0ff
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Sat Dec 23 07:20:41 2006 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit a732df8670208b4cbf5cd5a132d8c6a0ee2a70f4
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Sat Dec 23 07:12:27 2006 -0800

    removed the reference to xrl commit as this appears to squash the program statement.

commit 5475f3fb81aa869cc330ee3b9125bf3fa22bc0ff
Merge: 3b5c73253d81d7588209f1112b487390450f657a 244ce40aabaee1b7604e081617fd8137180dfb40
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Fri Dec 22 16:54:01 2006 -0800

    Merge /usr/local/git/vyattacli

commit 3b5c73253d81d7588209f1112b487390450f657a
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Fri Dec 22 16:52:41 2006 -0800

    Adjust for configuration directory structure changes
    Add debug option to configuration script

commit 244ce40aabaee1b7604e081617fd8137180dfb40
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 22 15:51:52 2006 -0800

    Added handler code for errors on commit to be returned back to user user process.

commit 2ce9a5a88622ab0768abef209bf5426fdc95aa6c
Merge: 116d283582ccdcc4d7233fc7e4507307f7e9ceb2 316cdfeb8bc25bb97bac1b5775055d53b197e0f4
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 22 13:11:56 2006 -0800

    Merge branch 'master' of /usr/local/git/vyattacli into working_vyattacli

commit 116d283582ccdcc4d7233fc7e4507307f7e9ceb2
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 22 12:57:45 2006 -0800

    modified to move closer to merge state

commit 3eda1c98f3f9a86ec869c75b57f49649220c26c7
Merge: 3f267af8f3e47ad059c55df0aa2c7583f5d696ed 9c284d5efcf1b6a9a41b65103ea4b4fe582d441e
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 22 12:53:32 2006 -0800

    Merge branch 'master' of git://suva.vyatta.com/xorp into working_vyattacli

commit 3f267af8f3e47ad059c55df0aa2c7583f5d696ed
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 22 12:53:27 2006 -0800

    Added show command support for vpn secrets file. Also modified template file to remove status files and not clean directory on start-commit.

commit 316cdfeb8bc25bb97bac1b5775055d53b197e0f4
Author: Justin Fletcher <jfletcher at phuket.vyatta.com>
Date:   Thu Dec 21 17:45:26 2006 -0800

    Add Openswan VPN configuration scripts

commit 5b0bcf73da062fee09e10d0a48b860d49124e965
Merge: b35bfa2e25ae33e6f8b9a721db1b7707ce886af7 85a894bbdbd9499fefb4b8d6d8315879c8cb052b
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Dec 20 14:46:29 2006 -0800

    Merge branch 'tempcli' into working_vyattacli

commit b35bfa2e25ae33e6f8b9a721db1b7707ce886af7
Merge: 648e2eede3f8090a580fca118c03bdd8bbde0400 e266b2e7d017ee8d101582589e601e62b4c01b3f
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Dec 20 14:41:19 2006 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit 648e2eede3f8090a580fca118c03bdd8bbde0400
Merge: 3643c9295ee1cd83ee2110b89e3a4352034806c7 8ffa7708360cbb977632174703802e35744dca62
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Dec 20 14:40:47 2006 -0800

    Merge branch 'master' of git://suva.vyatta.com/xorp into working_vyattacli

commit e266b2e7d017ee8d101582589e601e62b4c01b3f
Merge: f1e92f130813156e8431e798af4433be7f2e2bd4 804235bf41bf817437034416e2572fecdb27cea2
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Wed Dec 20 14:39:30 2006 -0800

    Added command processing for vpn show commands.
    
    Merge branch 'master' into vyattacli
    
    Conflicts:
    
    	rl_xg/html/css/main.css

commit 3643c9295ee1cd83ee2110b89e3a4352034806c7
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Tue Dec 19 17:13:54 2006 -0800

    added status file to handle deletion of nodes in vpn, and cleaning of config tree at start of commit.

commit 85a894bbdbd9499fefb4b8d6d8315879c8cb052b
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Tue Dec 19 14:56:50 2006 -0800

    Adjusted margins.

commit 036ee691982eadf7248dbbd7b93feb8202f973cf
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Dec 18 10:12:58 2006 -0800

    Added to template to build out all nodes in directory config--only leafs generated directory construction at this point.

commit ff43bb20989fd0555f90cbdb8092581e95ff04c9
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Mon Dec 18 09:01:15 2006 -0800

    Added rl_vpn.tp to the include file so that it is installed as part of the image

commit ac69cfc1462980814a5183d7b7e1f00ac9ca30bc
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 16:44:01 2006 -0800

    Fixed template to work with current image and create directory (structure subject to change).

commit f25a55a20d9bfd4e8be9ad9c64a226d2ddd5cca6
Merge: 2f892227238c48b150ffe871b5b7aee5b2dfecc9 f1e92f130813156e8431e798af4433be7f2e2bd4
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 15:27:19 2006 -0800

    Merge branch 'vyattacli' into working_vyattacli

commit 2f892227238c48b150ffe871b5b7aee5b2dfecc9
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 15:23:00 2006 -0800

    Merging xgdaemon changes.

commit 0f1e596b85469ad2d91dd13abd4b702e84535088
Merge: c6e7ca6856051b2a40e07cfd68eea21e92773e69 804235bf41bf817437034416e2572fecdb27cea2
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 11:00:17 2006 -0800

    Merge branch 'master' of git://suva.vyatta.com/xorp into working_vyattacli

commit c6e7ca6856051b2a40e07cfd68eea21e92773e69
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 11:00:02 2006 -0800

    Added more files to initial checkin.

commit be96084ee8cc6783d0e38e5ea3a6c4d07a6e62ac
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 15 10:59:08 2006 -0800

    Initial checkin of dummy vrp module

commit f1e92f130813156e8431e798af4433be7f2e2bd4
Author: Marat Nepomnyashy <marat at vyatta.com>
Date:   Thu Dec 14 16:54:35 2006 -0800

    Implemented GUI client area auto-adjustment in relation to browser window resize.

commit 98ba6db1ce490eca17d099bf79f2fa768880cd24
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Dec 14 16:41:01 2006 -0800

    Revert "Added hook for commit at end of commit operations."
    
    This reverts commit 01e603d5463aefd88eb1797711c68b3dca5b5f56.

commit b5d0d97f2f16876a2af6f512f895e25897a5ba46
Merge: 0389f54890fc529f3f4a4886991357235ef27350 2f5ca474a1da7c79797df9e6cc90004d6f71ec38
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Dec 14 16:17:47 2006 -0800

    Merge branch 'master' of git://suva.vyatta.com/xorp into working_vyattacli

commit 0389f54890fc529f3f4a4886991357235ef27350
Merge: 0b795963a6b9c2e9b337daf7e9dbcfb351215f8e d850252b1eb85d65f14068fab0969ee290377577
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Thu Dec 14 09:38:09 2006 -0800

    Merge branch 'master' of git://suva.vyatta.com/xorp into working_vyattacli

commit 0b795963a6b9c2e9b337daf7e9dbcfb351215f8e
Merge: 01e603d5463aefd88eb1797711c68b3dca5b5f56 4236f9b6719e74e90f506df71c35e4418db3b527
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 8 21:42:22 2006 -0800

    Merge branch 'master' of git://suva.vyatta.com/xorp into working_vyattacli

commit 01e603d5463aefd88eb1797711c68b3dca5b5f56
Author: Mike Larson <mike at phuket.vyatta.com>
Date:   Fri Dec 8 21:41:40 2006 -0800

    Added hook for commit at end of commit operations.