Commit Graph

8 Commits

Author SHA1 Message Date
Martin Blapp
fb26c675fb Resolve conflicts. 2003-09-02 11:13:21 +00:00
David E. O'Brien
42f38b97ae Merge our spelling changes into isc_dhcp_3_0_1_rc11. 2003-01-16 07:19:43 +00:00
Murray Stokely
117ed71ada Resolve conflicts (fix spelling errors). 2002-09-30 08:46:23 +00:00
Murray Stokely
edc4c2b49d Resolve conflicts.
* Note that option hostname is only honored if the hostname is not
    already set. (r1.2)
2002-02-19 12:15:09 +00:00
David E. O'Brien
64da768b1d Document that dhclient-script will only set the hostname if it is unset.
Submitted by:	John Baldwin <jobaldwi@vt.edu>
1999-09-02 05:15:26 +00:00
David E. O'Brien
f96b6240a8 Virgin import of ISC-DHCP v2.0b1pl27 1999-05-02 09:03:51 +00:00
David E. O'Brien
b02401bdd6 Virgin import of ISC-DHCP v2.0b1pl11 1999-02-11 12:40:22 +00:00
David E. O'Brien
cd2d014aab Virgin import of ISC-DHCP v2.0b1pl6 1999-02-10 09:10:13 +00:00