apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.11 to master

Browse Source 
* 4.11:
  CLOUDSTACK-10287 package require open jdk 1.8 (#2519)
  make Broadcast- and IsolationURI visible to admin (#2520)
This commit is contained in:
Daan Hoogland 2018-04-03 08:18:37 +02:00
commit 9124f97447
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packaging/centos7/cloud.spec
View File

@ -53,7 +53,7 @@ intelligent IaaS cloud implementation.
%package management
Summary: CloudStack management server UI
Requires: java => 1.8.0
Requires: java-1.8.0-openjdk
Requires: apache-commons-daemon-jsvc
Requires: python
Requires: bash
@ -92,7 +92,7 @@ The Apache CloudStack files shared between agent and management server
%package agent
Summary: CloudStack Agent for KVM hypervisors
Requires: openssh-clients
Requires: java => 1.8.0
Requires: java-1.8.0-openjdk
Requires: %{name}-common = %{_ver}
Requires: libvirt
Requires: bridge-utils
@ -125,7 +125,7 @@ The CloudStack baremetal agent
%package usage
Summary: CloudStack Usage calculation server
Requires: java => 1.8.0
Requires: java-1.8.0-openjdk
Requires: mysql-connector-java
Group: System Environment/Libraries
%description usage

17
ui/scripts/instances.js
View File

@ -2835,6 +2835,16 @@
}
}
},
preFilter: function(args) {
var hiddenFields;
if (isAdmin()) {
hiddenFields = [];
} else {
hiddenFields = ["broadcasturi", "isolationuri"];
}
return hiddenFields;
},
fields: [{
id: {
label: 'label.id'
@ -2871,7 +2881,12 @@
ip6cidr: {
label: 'label.ipv6.CIDR'
},
broadcasturi : {
label: 'label.broadcast.uri'
},
isolationuri : {
label: 'label.isolation.uri'
},
isdefault: {
label: 'label.is.default',
converter: function(data) {