[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at 030fded90ff43d53d52a4dea72ad8448d4678b9a

[Adrian Likins]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  030fded90ff43d53d52a4dea72ad8448d4678b9a (commit)
      from  ebad4a23556023df5abd190d4d0b26742a0e2044 (commit)

- Log -----------------------------------------------------------------
commit 030fded90ff43d53d52a4dea72ad8448d4678b9a
Author: Adrian Likins <alikins at redhat.com>
Date:   Thu Apr 12 15:23:03 2007 -0400

    ugh, missed the conflict markers. fix.
-----------------------------------------------------------------------

Diffstat:
 build/test-it-all.sh |   24 ------------------------
 1 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/build/test-it-all.sh b/build/test-it-all.sh
index 9c3de54..ff86c78 100644
--- a/build/test-it-all.sh
+++ b/build/test-it-all.sh
@@ -126,34 +126,10 @@ start_client_services()
     /etc/init.d/virt-factory-nodes start
 }
 
-<<<<<<< master
-start
 register_system()
 {
     vf_register --serverurl=http://127.0.0.1:5150 --username admin --password fedora --profilename $1
 }
-=======
-#REMOTE_USER=$USER
-
-# note, the user you log in as needs perms to write to 
-# REMOTE_PATH 
-REMOTE_USER="mdehaan"
-REMOTE_HOST="mdehaan.rdu.redhat.com"
-REMOTE_PATH="/var/www/html/download"
-URL_PATH="/download/"
-
-
-# er, variables...
-REBUILD=N
-SYNC_REPOS=N
-INSTALL_PACKAGES=Y
-SETUP_PUPPET=Y
-VF_SERVER_IMPORT=Y
-VF_IMPORT=Y
-REFRESH_DB=Y
-START_SERVER=Y
->>>>>>> vf
-
 # commandline parsing
 while [ $# -gt 0 ]
 do

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  ebad4a23556023df5abd190d4d0b26742a0e2044 \
  030fded90ff43d53d52a4dea72ad8448d4678b9a