diff options
| author | Rick Balocca <rbalocca@vyatta.com> | 2008-10-28 11:48:24 -0700 |
|---|---|---|
| committer | Rick Balocca <rbalocca@vyatta.com> | 2008-10-28 11:48:24 -0700 |
| commit | 841e41f385ca960fb703ff612b014d7e57560b3e (patch) | |
| tree | 1c85e6040bbce551469aaa5461bcc2c58ba32da6 /scripts/vyatta_net_name | |
| parent | 056c3079a791a246907a442e35063f42af5b3a99 (diff) | |
| parent | 3537c028bc63e18568e70dfd3c1634d857918bc2 (diff) | |
| download | vyatta-cfg-system-841e41f385ca960fb703ff612b014d7e57560b3e.tar.gz vyatta-cfg-system-841e41f385ca960fb703ff612b014d7e57560b3e.zip | |
Merge branch 'islavista' into jenner
Conflicts:
scripts/install-system
scripts/standalone_root_pw_reset
Diffstat (limited to 'scripts/vyatta_net_name')
0 files changed, 0 insertions, 0 deletions