You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/04/24 18:23:58 UTC
[34/50] [abbrv] git commit: updated refs/heads/internallb to ca2fc30
CLOUDSTACK-1735: cloudstack UI - IPv6 - instances detailView - Nics tab - add IPv6 IP Address, IPv6 Gateway, IPv6 CIDR field.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/27900695
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/27900695
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/27900695
Branch: refs/heads/internallb
Commit: 27900695f4146630ef424fda57eca33379dfdfee
Parents: c9c2c59
Author: Jessica Wang <je...@apache.org>
Authored: Mon Apr 22 14:04:47 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Apr 22 14:05:56 2013 -0700
----------------------------------------------------------------------
ui/scripts/instances.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/27900695/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index bd8b7f6..3a43c60 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1326,10 +1326,15 @@
{
name: { label: 'label.name', header: true },
networkname: {label: 'Network Name' },
- ipaddress: { label: 'label.ip.address' },
type: { label: 'label.type' },
+ ipaddress: { label: 'label.ip.address' },
gateway: { label: 'label.gateway' },
netmask: { label: 'label.netmask' },
+
+ ip6address: { label: 'IPv6 IP Address' },
+ ip6gateway: { label: 'IPv6 Gateway' },
+ ip6cidr: { label: 'IPv6 CIDR' },
+
isdefault: {
label: 'label.is.default',
converter: function(data) {