You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/07/31 19:35:20 UTC

[1/2] git commit: updated refs/heads/master to 6007da1

Updated Branches:
  refs/heads/4.2 c68eb4d41 -> 0014381f3
  refs/heads/master 86aafa2db -> 6007da198


CLOUDSTACK-2944: Fix typo in addIpToNic dialog


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

Branch: refs/heads/master
Commit: 6007da198cec05e0244e8f000e0a7ed2793bffa6
Parents: 86aafa2
Author: Brian Federle <br...@citrix.com>
Authored: Wed Jul 31 10:34:46 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Jul 31 10:34:46 2013 -0700

----------------------------------------------------------------------
 ui/scripts/network.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6007da19/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d23dc62..e5a52f7 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1703,7 +1703,7 @@
                                 title: 'label.acquire.new.secondary.ip',
                                 desc: 'message.acquire.ip.nic',
                                 fields: {
-                                    ipaddr: {
+                                    ipaddress: {
                                         label: 'label.ip.address'
                                     }
                                 }
@@ -1718,8 +1718,8 @@
                                     nicId: args.context.nics[0].id
                                 };
 
-                                if (args.data.ipaddr) {
-                                    dataObj.ipaddr = args.data.ipaddr;
+                                if (args.data.ipaddress) {
+                                    dataObj.ipaddress = args.data.ipaddress;
                                 }
 
                                 $.ajax({


[2/2] git commit: updated refs/heads/4.2 to 0014381

Posted by bf...@apache.org.
CLOUDSTACK-2944: Fix typo in addIpToNic dialog


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

Branch: refs/heads/4.2
Commit: 0014381f38fe6887035c1d616c9f6d35da48dd96
Parents: c68eb4d
Author: Brian Federle <br...@citrix.com>
Authored: Wed Jul 31 10:34:46 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Jul 31 10:35:15 2013 -0700

----------------------------------------------------------------------
 ui/scripts/network.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0014381f/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d23dc62..e5a52f7 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1703,7 +1703,7 @@
                                 title: 'label.acquire.new.secondary.ip',
                                 desc: 'message.acquire.ip.nic',
                                 fields: {
-                                    ipaddr: {
+                                    ipaddress: {
                                         label: 'label.ip.address'
                                     }
                                 }
@@ -1718,8 +1718,8 @@
                                     nicId: args.context.nics[0].id
                                 };
 
-                                if (args.data.ipaddr) {
-                                    dataObj.ipaddr = args.data.ipaddr;
+                                if (args.data.ipaddress) {
+                                    dataObj.ipaddress = args.data.ipaddress;
                                 }
 
                                 $.ajax({