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

[Michael DeHaan]

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  ef510f6fd28d4196e166e03f18a826d1a1349091 (commit)
       via  9c6aa6e5db1d02ae1d0008231459e97763e24cac (commit)
      from  bd1e75a2a0c0ac4bf100b895dce1cbef0a55a2f3 (commit)

- Log -----------------------------------------------------------------
commit ef510f6fd28d4196e166e03f18a826d1a1349091
Merge: 9c6aa6e... bd1e75a...
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Tue Apr 17 17:00:43 2007 -0400

    Merge with git+ssh://g-mdehaan@et.redhat.com/git/virt-factory

commit 9c6aa6e5db1d02ae1d0008231459e97763e24cac
Author: Michael DeHaan <mdehaan at mdehaan.rdu.redhat.com>
Date:   Tue Apr 17 17:00:22 2007 -0400

    Cobbler clear commands look suspicious.
-----------------------------------------------------------------------

Diffstat:
 service/modules/provisioning.py |    8 ++++----
 service/server/taskatron.py     |    3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/service/modules/provisioning.py b/service/modules/provisioning.py
index 3a1696f..c19309e 100755
--- a/service/modules/provisioning.py
+++ b/service/modules/provisioning.py
@@ -432,10 +432,10 @@ class Provisioning(web_svc.AuthWebSvc):
          cobbler_distros  = cobbler_api.distros()
          cobbler_profiles = cobbler_api.profiles()
          cobbler_systems  = cobbler_api.systems()
-         cobbler_distros.clear()
-         cobbler_profiles.clear()
-         cobbler_systems.clear()
-         cobbler_repos.clear()
+         # cobbler_distros.clear()
+         # cobbler_profiles.clear()
+         # cobbler_systems.clear()
+         # cobbler_repos.clear()
          
          # cobbler can/will could raise exceptions on failure at any point...
          # return code checking is not needed.
diff --git a/service/server/taskatron.py b/service/server/taskatron.py
index a9c1176..275db83 100755
--- a/service/server/taskatron.py
+++ b/service/server/taskatron.py
@@ -322,8 +322,7 @@ def main(argv):
 
     taskatron = Taskatron()
     if len(sys.argv) > 2 and sys.argv[1].lower() == "--test":
-        handle = get_handle(sys.argv[2])
-        print handle.test_add(1,2)
+        print taskatron.node_comm(sys.argv[2],"test_add",1,2)
     elif len(sys.argv) > 1 and sys.argv[1].lower() == "--daemon":
         taskatron.clean_up_tasks()
         utils.daemonize("/var/run/vf_taskatron.pid")

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  bd1e75a2a0c0ac4bf100b895dce1cbef0a55a2f3 \
  ef510f6fd28d4196e166e03f18a826d1a1349091