DaanHoogland closed pull request #3034: Display mac address in nic detail view
URL: https://github.com/apache/cloudstack/pull/3034
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ui/l10n/de_DE.js b/ui/l10n/de_DE.js
index e09062fd9fd..cae753e7e40 100644
--- a/ui/l10n/de_DE.js
+++ b/ui/l10n/de_DE.js
@@ -976,6 +976,7 @@ var dictionary = {
"label.logout": "Abmelden",
"label.lun": "LUN",
"label.lxc.traffic.label": "LXC Datenverkehrs-Bezeichnung",
+ "label.mac.address": "MAC Adresse",
"label.make.project.owner": "Mache Benutzerkonto zum Projekteigentümer",
"label.make.redundant": "Redundant machen",
"label.manage": "Verwalten",
diff --git a/ui/l10n/en.js b/ui/l10n/en.js
index e0fb6e7544a..fb537f2f0eb 100644
--- a/ui/l10n/en.js
+++ b/ui/l10n/en.js
@@ -1014,6 +1014,7 @@ var dictionary = {
"label.management":"Management",
"label.management.ips":"Management IP Addresses",
"label.management.server":"Management Server",
+"label.mac.address": "MAC Address",
"label.mac.address.changes":"MAC Address Changes",
"label.max.cpus":"Max. CPU cores",
"label.max.guest.limit":"Max guest limit",
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6dc45c067cc..3b5816b039a 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2865,6 +2865,9 @@
type: {
label: 'label.type'
},
+ macaddress: {
+ label: 'label.mac.address'
+ },
ipaddress: {
label: 'label.ip.address'
},
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
