cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 87effa4
Date Fri, 11 Jul 2014 20:47:33 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master aab6e1222 -> 87effa40e


UI > IP Address > hide EnableVPN option on acquired IP.


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

Branch: refs/heads/master
Commit: 87effa40ea267d2e334aadb0a201fc031d9c09a8
Parents: aab6e12
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Jul 11 13:46:29 2014 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Jul 11 13:46:29 2014 -0700

----------------------------------------------------------------------
 ui/scripts/network.js | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87effa40/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 2039aa0..3c8107b 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -248,6 +248,7 @@
                 disallowedActions.push('disableStaticNAT');
                 disallowedActions.push('remove');
             } else { //non-sourceNAT IP supports staticNAT
+            	disallowedActions.push('enableVPN');
             	 if (ipObj.isstaticnat) {
                      disallowedActions.push('enableStaticNAT');
                  } else {


Mime
View raw message