cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [2/2] git commit: updated refs/heads/4.4 to f1a714c
Date Tue, 11 Nov 2014 15:08:00 GMT
CLOUDSTACK-7246: corrected script name of createipalias

(cherry picked from commit 1bfb1f6503167c3de2c01894b32d287a98424dbc)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1a714c0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1a714c0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1a714c0

Branch: refs/heads/4.4
Commit: f1a714c02243d99eabb8313595feb33299ed6288
Parents: 987131f
Author: Jayapal <jayapal@apache.org>
Authored: Tue Aug 5 14:41:12 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Tue Nov 11 16:07:42 2014 +0100

----------------------------------------------------------------------
 .../resource/virtualnetwork/VirtualRoutingResourceTest.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1a714c0/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
----------------------------------------------------------------------
diff --git a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
index 9f6c0db..5f00533 100644
--- a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
+++ b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
@@ -1045,10 +1045,10 @@ public class VirtualRoutingResourceTest implements VirtualRouterDeployer
{
                 "/opt/cloud/bin/vpc_portforwarding.sh -D -P udp -l 64.1.1.11 -p 8080:8080
-r 10.10.1.11 -d 8080-8080\n" +
                 "</script>\n" +
                 "<script>\n" +
-                "/opt/cloud/bin/createipAlias.sh 1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0-\n"
+
+                "/opt/cloud/bin/createIpAlias.sh 1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0-\n"
+
                 "</script>\n" +
                 "<script>\n" +
-                "/opt/cloud/bin/deleteipAlias.sh 1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0--
1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0-\n"
+
+                "/opt/cloud/bin/deleteIpAlias.sh 1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0--
1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0-\n"
+
                 "</script>\n" +
                 "<script>\n" +
                 "/opt/cloud/bin/dnsmasq.sh 10.1.20.2:10.1.20.1:255.255.255.0:10.1.20.5-10.1.21.2:10.1.21.1:255.255.255.0:10.1.21.5-\n"
+


Mime
View raw message