diff --git a/NOTICE.txt b/NOTICE.txt index 41ed32c1c691..b48c5475c962 100755 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -23,19 +23,11 @@ relicensed so we could use it as Creative Commons Attribution 3.0. The license is bundled with the download available here: http://www.vectorportal.com/subcategory/205/KILLER-WHALE-FREE-VECTOR.eps/ifile/9136/detailtest.asp -- -This product includes portions of the Bootstrap project v3.0.0 +This product includes portions of the Bootstrap project v5.3.3 -Copyright 2013 Twitter, Inc. +Copyright 2011-2024 The Bootstrap Authors -Licensed under the Apache License v2.0 - -This product uses the Glyphicons Halflings icon set. - -http://glyphicons.com/ - -Copyright Jan Kovařík - -Licensed under the Apache License v2.0 as a part of the Bootstrap project. +Licensed under the MIT license -- This product includes portions of the Guava project v14 and v21, specifically diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java index 2581d9cbf358..a9e8fa7cbe16 100644 --- a/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java +++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java @@ -326,7 +326,7 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) String[] readOnlyLogLevels = conf.getStrings(READONLY_LOGGERS_CONF_KEY); if (logName != null) { - out.println("

Results:

"); + out.println("

Results

"); out.println(MARKER + "Submitted Log Name: " + logName + "
"); Logger log = LoggerFactory.getLogger(logName); @@ -373,23 +373,28 @@ private void sendError(HttpServletResponse response, int code, String message) static final String FORMS = "
\n" + "
\n" + "
\n" - + "

Get/Set Log Level

\n" + "
\n" + "
\n" + "Actions:" + "

" + "

\n" - + "\n" + "\n" + "\n" - + "\n" + "\n" + "\n" + "\n" - + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" - + "\n" + "
\n" - + "\n" + "\n" - + "\n" + "" - + "Get the current log level for the specified log name." + "
\n" - + "\n" + "\n" - + "\n" - + "\n" + "" - + "Set the specified log level for the specified log name." + "
\n" + "
\n" + "

\n" + "
\n"; + + "

Get/Set Log Level

\n" + "
\n" + "\n" + "\n" + "

Actions

\n" + + "\n" + "
\n" + "
\n" + + "
\n" + + "
\n" + + "\n" + "
\n" + + "
\n" + + "\n" + "
\n" + + "
\n" + + "Gets the current log level for the specified log name.\n" + "
\n" + + "
\n" + "
\n" + "
\n" + "\n" + "
\n" + "
\n" + + "\n" + "
\n" + + "
\n" + + "\n" + "
\n" + + "
\n" + + "\n" + + "\n" + "
\n" + + "
\n" + + "Sets the specified log level for the specified log name.\n" + "
\n" + + "
\n" + "\n" + "
\n" + "
" + "
\n"; private static void process(Logger logger, String levelName, PrintWriter out) { if (levelName != null) { diff --git a/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm b/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm index 067ed3d0c66d..8be266c787ef 100644 --- a/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm +++ b/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm @@ -54,19 +54,11 @@ http://www.vectorportal.com/subcategory/205/KILLER-WHALE-FREE-VECTOR.eps/ifile/9 ## For modules that have bootstrap in their source tree #macro(bootstrap_notice) -- -This product includes portions of the Bootstrap project v3.0.0 +This product includes portions of the Bootstrap project v5.3.3 -Copyright 2013 Twitter, Inc. +Copyright 2011-2024 The Bootstrap Authors -Licensed under the Apache License v2.0 - -This product uses the Glyphicons Halflings icon set. - -http://glyphicons.com/ - -Copyright Jan Kovařík - -Licensed under the Apache License v2.0 as a part of the Bootstrap project. +Licensed under the MIT license #end ## no NOTICE file. #macro(findbugs_cleanroom_notice) diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp index a642ac36eff7..1f17eecf3f39 100644 --- a/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp +++ b/hbase-rest/src/main/resources/hbase-webapps/rest/footer.jsp @@ -23,8 +23,8 @@ diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/header.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/header.jsp index 67f7656de592..6df154594f8f 100644 --- a/hbase-rest/src/main/resources/hbase-webapps/rest/header.jsp +++ b/hbase-rest/src/main/resources/hbase-webapps/rest/header.jsp @@ -30,45 +30,41 @@ - + -
+
+ + + diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/processRest.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/processRest.jsp index 2b2d35fbfb3f..a5820de572af 100644 --- a/hbase-rest/src/main/resources/hbase-webapps/rest/processRest.jsp +++ b/hbase-rest/src/main/resources/hbase-webapps/rest/processRest.jsp @@ -105,16 +105,16 @@ pageContext.setAttribute("pageTitle", "Process info for PID: " + JSONMetricUtil. <% if (gcBeans.size() == 2) { %>
-