[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-7-g696b58f

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  696b58f5dd8370b7ee0670c7a3e5db10234b41ff (commit)
      from  d3336684f084f984500dd0893dd01bcfc5be0ab1 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 696b58f5dd8370b7ee0670c7a3e5db10234b41ff
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Apr 2 12:31:24 2008 +1100

    Fix conflicts in setup/provision script.

-----------------------------------------------------------------------

Summary of changes:
 source/setup/provision |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/setup/provision b/source/setup/provision
index afda9ee..259bd81 100755
--- a/source/setup/provision
+++ b/source/setup/provision
@@ -57,17 +57,9 @@ parser.add_option("--invocationid", type="string", metavar="GUID",
 parser.add_option("--host-name", type="string", metavar="HOSTNAME", 
 		help="set hostname")
 parser.add_option("--host-ip", type="string", metavar="IPADDRESS", 
-<<<<<<< HEAD:source/setup/provision
-		help="set ipaddress")
-=======
 		help="set IPv4 ipaddress")
 parser.add_option("--host-ip6", type="string", metavar="IP6ADDRESS", 
 		help="set IPv6 ipaddress")
-parser.add_option("--host-guid", type="string", metavar="GUID", 
-		help="set hostguid (otherwise random)")
-parser.add_option("--invocationid", type="string", metavar="GUID", 
-		help="set invocationid (otherwise random)")
->>>>>>> 8585a3c77d5dfe97bca3f08716fc06ac2819f578:source/setup/provision
 parser.add_option("--adminpass", type="string", metavar="PASSWORD", 
 		help="choose admin password (otherwise random)")
 parser.add_option("--krbtgtpass", type="string", metavar="PASSWORD", 


-- 
Samba Shared Repository