VPC: typo fix
Conflicts:
scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/337c36d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/337c36d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/337c36d8
Branch: refs/heads/vpc
Commit: 337c36d8b992a7ad724d2e74f39ad7ebbe606a6e
Parents: f5056d4
Author: anthony <[email protected]>
Authored: Wed Jun 6 12:13:43 2012 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Fri Jun 15 14:23:41 2012 -0700
----------------------------------------------------------------------
scripts/vm/hypervisor/xenserver/xcpserver/patch | 4 ++--
scripts/vm/hypervisor/xenserver/xenserver60/patch | 3 +--
wscript | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/337c36d8/scripts/vm/hypervisor/xenserver/xcpserver/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcpserver/patch
b/scripts/vm/hypervisor/xenserver/xcpserver/patch
index 74338f7..6e9603b 100644
--- a/scripts/vm/hypervisor/xenserver/xcpserver/patch
+++ b/scripts/vm/hypervisor/xenserver/xcpserver/patch
@@ -1,4 +1,5 @@
# This file specifies the files that need
+#
# to be transferred over to the XenServer.
# The format of this file is as follows:
# [Name of file]=[source path],[file permission],[destination path]
@@ -11,7 +12,6 @@
# If [source path] does not start with '/' or '~', then it is relative path to
the location of the patch file.
NFSSR.py=/opt/xensource/sm
vmops=..,0755,/etc/xapi.d/plugins
-ovsgre=..,0755,/etc/xapi.d/plugins
ovstunnel=..,0755,/etc/xapi.d/plugins
vmopsSnapshot=..,0755,/etc/xapi.d/plugins
hostvmstats.py=..,0755,/opt/xensource/sm
@@ -23,7 +23,7 @@ make_migratable.sh=..,0755,/opt/xensource/bin
setup_iscsi.sh=..,0755,/opt/xensource/bin
pingtest.sh=../../..,0755,/opt/xensource/bin
dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
-ipassoc.sh=../../../../network/domr/,0755,/opt/xensource/bin
+router_proxy.sh=../../../../network/domr/,0755,/opt/xensource/bin
vm_data.sh=../../../../network/domr/,0755,/opt/xensource/bin
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/xensource/bin
networkUsage.sh=../../../../network/domr/,0755,/opt/xensource/bin
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/337c36d8/scripts/vm/hypervisor/xenserver/xenserver60/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver60/patch
b/scripts/vm/hypervisor/xenserver/xenserver60/patch
index f087c3a..f373900 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver60/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver60/patch
@@ -15,7 +15,6 @@ xen-ovs-vif-flows.rules=..,0644,/etc/udev/rules.d
ovs-vif-flows.py=..,0755,/etc/xapi.d/plugins
cloudstack_plugins.conf=..,0644,/etc/xensource
cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins
-ovsgre=..,0755,/etc/xapi.d/plugins
ovstunnel=..,0755,/etc/xapi.d/plugins
vmopsSnapshot=..,0755,/etc/xapi.d/plugins
hostvmstats.py=..,0755,/opt/xensource/sm
@@ -32,7 +31,7 @@
save_password_to_domr.sh=../../../../network/domr/,0755,/opt/xensource/bin
networkUsage.sh=../../../../network/domr/,0755,/opt/xensource/bin
call_firewall.sh=../../../../network/domr/,0755,/opt/xensource/bin
call_loadbalancer.sh=../../../../network/domr/,0755,/opt/xensource/bin
-router_proxy=../../../../network/domr/,0755,/opt/xensource/bin
+router_proxy.sh=../../../../network/domr/,0755,/opt/xensource/bin
l2tp_vpn.sh=../../../../network/domr/,0755,/opt/xensource/bin
cloud-setup-bonding.sh=..,0755,/opt/xensource/bin
copy_vhd_to_secondarystorage.sh=..,0755,/opt/xensource/bin
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/337c36d8/wscript
----------------------------------------------------------------------
diff --git a/wscript b/wscript
index 1d33861..a566a97 100644
--- a/wscript
+++ b/wscript
@@ -4,7 +4,7 @@
# the following two variables are used by the target "waf dist"
# if you change 'em here, you need to change it also in cloud.spec, add a
%changelog entry there, and add an entry in debian/changelog
-VERSION = '3.0.3.2012-06-06T01:46:43Z'
+VERSION = '3.0.3.2012-06-06T18:22:16Z'
APPNAME = 'cloud'
import shutil,os
