This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 7c2cf00 KNOX-1868 - HBase UI changes from KNOX-1866 aren't picked up
due to service.xml version (#95)
7c2cf00 is described below
commit 7c2cf00332c5f5123516cebca6f942bfda5eb516
Author: Kevin Risden <[email protected]>
AuthorDate: Thu May 30 12:11:30 2019 -0400
KNOX-1868 - HBase UI changes from KNOX-1866 aren't picked up due to
service.xml version (#95)
Signed-off-by: Kevin Risden <[email protected]>
---
.../src/main/resources/services/hbaseui/2.1.0/rewrite.xml | 2 +-
.../src/main/resources/services/hbaseui/2.1.0/service.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/gateway-service-definitions/src/main/resources/services/hbaseui/2.1.0/rewrite.xml
b/gateway-service-definitions/src/main/resources/services/hbaseui/2.1.0/rewrite.xml
index 8ee9294..b8133af 100644
---
a/gateway-service-definitions/src/main/resources/services/hbaseui/2.1.0/rewrite.xml
+++
b/gateway-service-definitions/src/main/resources/services/hbaseui/2.1.0/rewrite.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<rules>
- <rule dir="IN" name="HBASEUI/hbase/inbound/master/root/qualified"
pattern="*://*:*/**/hbase/webui/?{host}?port}">
+ <rule dir="IN" name="HBASEUI/hbase/inbound/master/root/qualified"
pattern="*://*:*/**/hbase/webui/?{host}?{port}">
<rewrite
template="{$serviceScheme[HBASEUI]}://{host}:{port}/master-status"/>
</rule>
<!-- Make sure that redirects back to the master landing page work -->
diff --git
a/gateway-service-definitions/src/main/resources/services/hbaseui/2.1.0/service.xml
b/gateway-service-definitions/src/main/resources/services/hbaseui/2.1.0/service.xml
index 83f399c..4b0ecfc 100644
---
a/gateway-service-definitions/src/main/resources/services/hbaseui/2.1.0/service.xml
+++
b/gateway-service-definitions/src/main/resources/services/hbaseui/2.1.0/service.xml
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<service role="HBASEUI" name="hbase" version="1.2.4">
+<service role="HBASEUI" name="hbaseui" version="2.1.0">
<routes>
<!-- Fixes the stylesheet on the logs servlet -->
<route path="/hbase/webui/logs/jetty-dir.css">
