You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/14 23:16:46 UTC
[32/51] [abbrv] git commit: remove patch for ovm agent due to license
incompatible will keep them in another place
remove patch for ovm agent due to license incompatible
will keep them in another place
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7f8a1aab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7f8a1aab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7f8a1aab
Branch: refs/heads/4.0
Commit: 7f8a1aabbf9b6764780e0c2ad870009c5555c2d4
Parents: 59de1fa
Author: frank <fr...@citrix.com>
Authored: Thu Sep 13 13:42:29 2012 -0700
Committer: frank <fr...@citrix.com>
Committed: Thu Sep 13 13:43:33 2012 -0700
----------------------------------------------------------------------
..._reposExceptionDueToWrongReturnValueCheck.patch | 13 --------
.../OvmDontTouchOCFS2ClusterWhenAgentStart.patch | 13 --------
.../ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch | 23 ---------------
3 files changed, 0 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f8a1aab/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/Fixget_storage_reposExceptionDueToWrongReturnValueCheck.patch
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/Fixget_storage_reposExceptionDueToWrongReturnValueCheck.patch b/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/Fixget_storage_reposExceptionDueToWrongReturnValueCheck.patch
deleted file mode 100755
index 7c41e55..0000000
--- a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/Fixget_storage_reposExceptionDueToWrongReturnValueCheck.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/OVSXUtility.py b/OVSXUtility.py
-index 4a98bc8..1053ef7 100644
---- a/OVSXUtility.py
-+++ b/OVSXUtility.py
-@@ -160,7 +160,7 @@ def get_storage_repos():
- l = parse_storage_repos()
- for sr in l:
- d = get_storage_free_space(sr)
-- if d:
-+ if len(d) > 0:
- d_repos_space[sr] = d[sr]
-
- if not d_repos_space:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f8a1aab/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDontTouchOCFS2ClusterWhenAgentStart.patch
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDontTouchOCFS2ClusterWhenAgentStart.patch b/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDontTouchOCFS2ClusterWhenAgentStart.patch
deleted file mode 100755
index dfe8462..0000000
--- a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDontTouchOCFS2ClusterWhenAgentStart.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/OVSAgentAutoStart.py b/OVSAgentAutoStart.py
-index 88fa18c..794a363 100755
---- a/OVSAgentAutoStart.py
-+++ b/OVSAgentAutoStart.py
-@@ -111,8 +111,6 @@ def prepare_cluster_heartbeat():
- JOBS = [
- ["command", join(dirname(__file__), "utils/upgrade_agent.py")],
- ["function", "get_agent_version", ()],
-- ["function", "prepare_cluster_root", ()],
-- ["function", "prepare_cluster_heartbeat", ()],
- ["command", join(dirname(__file__), "utils/upgrade.py")],
- ["command_bg", join(dirname(__file__), "OVSRemasterServer.py")],
- ["command_bg", join(dirname(__file__), "OVSMonitorServer.py")],
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7f8a1aab/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch b/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch
deleted file mode 100755
index 5f4c7a5..0000000
--- a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-*** OVSServices.py 2011-06-06 12:31:23.279919998 -0700
---- /tmp/OVSServices.py 2011-06-06 12:32:13.275919997 -0700
-***************
-*** 68,73 ****
---- 68,75 ----
- import OVSVMXParser #pylint: disable-msg=W0611
- import OVSVMDKParser #pylint: disable-msg=W0611
-
-+ import OvmDispatcher
-+
- from OVSWrappers import D
- from OVSCommons import exposed
-
-***************
-*** 113,118 ****
---- 115,121 ----
- self.sleep = sleep
-
- self._load_modules()
-+ OvmDispatcher.InitOvmDispacther()
-
- # #xenapi
- # import xen.xend.XendAPI as XendAPI