From 23ae6762bdcd5920bc8a97372c1a75e7f860a161 Mon Sep 17 00:00:00 2001
From: dahn <daan.hoogland@gmail.com>
Date: Mon, 2 Apr 2018 21:55:18 +0000
Subject: [PATCH 1/2] make Broadcast- and IsolationURI visible to admin (#2520)

---
 ui/scripts/instances.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index ab075b01f14..84d60033045 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -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) {

From cff4032f001a17f25346da3141ac7da5f5dcce7f Mon Sep 17 00:00:00 2001
From: dahn <daan.hoogland@gmail.com>
Date: Mon, 2 Apr 2018 22:01:41 +0000
Subject: [PATCH 2/2] CLOUDSTACK-10287 package require open jdk 1.8 (#2519)

---
 packaging/centos7/cloud.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 0d4aca44b4a..6ed36915ac9 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -58,7 +58,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
@@ -97,7 +97,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
@@ -130,7 +130,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