Updated Branches: refs/heads/master 1a2e69fb2 -> 1ff7a147b
Revert "Summary: fix ipsectunnel.sh being called as ipsectunnel in KVM S2S vpn" This reverts commit 1a2e69fb22a64b84960860965d4f757637ac5e12. accidentally pushed mode change of sh file as well, need to split this out Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1ff7a147 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1ff7a147 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1ff7a147 Branch: refs/heads/master Commit: 1ff7a147bd267d0b9221a8070e47b6a84cafd56d Parents: 1a2e69f Author: Marcus Sorensen <[email protected]> Authored: Thu Jan 17 11:17:43 2013 -0700 Committer: Marcus Sorensen <[email protected]> Committed: Thu Jan 17 11:17:43 2013 -0700 ---------------------------------------------------------------------- .../virtualnetwork/VirtualRoutingResource.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1ff7a147/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index 18a0426..2dc7950 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -720,7 +720,7 @@ public class VirtualRoutingResource implements Manager { args += " -N "; args += cmd.getPeerGuestCidrList(); } - String result = routerProxy("ipsectunnel.sh", cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), args); + String result = routerProxy("ipsectunnel", cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP), args); if (result != null) { return new Answer(cmd, false, "Configure site to site VPN failed due to " + result); } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/1ff7a147/scripts/storage/qcow2/resizevolume.sh ---------------------------------------------------------------------- diff --git a/scripts/storage/qcow2/resizevolume.sh b/scripts/storage/qcow2/resizevolume.sh old mode 100755 new mode 100644
