Skip to content

Commit 88e3daf

Browse files
AnanyaSingh2121AnanyaSingh2121
authored
HDFS-16317 : Backport HDFS-14729 for branch-3.2.3 (#3780)
Reviewed-by: Brahma Reddy Battula <brahma@apache.org>
1 parent d93760c commit 88e3daf

34 files changed

+977
-697
lines changed

‎LICENSE.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ OTHER DEALINGS IN THE SOFTWARE.
617617

618618
The binary distribution of this product bundles these dependencies under the
619619
following license:
620-
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.3.7
620+
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.4.1
621621
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/bootstrap.min.js
622622
hadoop-tools/hadoop-sls/src/main/html/css/bootstrap.min.css
623623
hadoop-tools/hadoop-sls/src/main/html/css/bootstrap-responsive.min.css
@@ -761,7 +761,7 @@ THE SOFTWARE.
761761

762762

763763
For:
764-
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.3.1.min.js
764+
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/jquery-3.4.1.min.js
765765
hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/jquery.js
766766
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/webapps/static/jquery
767767
Apache HBase - Server which contains JQuery minified javascript library version 1.8.3

‎hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/webapps/router/federationhealth.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<html xmlns="http://www.w3.org/1999/xhtml">
2020
<head>
2121
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
22-
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.3.7/css/bootstrap.min.css" />
22+
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.4.1/css/bootstrap.min.css" />
2323
<link rel="stylesheet" type="text/css" href="/static/dataTables.bootstrap.css" />
2424
<link rel="stylesheet" type="text/css" href="/static/rbf.css" />
2525
<title>Router Information</title>
@@ -424,9 +424,9 @@
424424

425425

426426

427-
<script type="text/javascript" src="/static/jquery-3.3.1.min.js"></script>
427+
<script type="text/javascript" src="/static/jquery-3.4.1.min.js"></script>
428428
<script type="text/javascript" src="/static/jquery.dataTables.min.js"></script>
429-
<script type="text/javascript" src="/static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
429+
<script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
430430
<script type="text/javascript" src="/static/dataTables.bootstrap.js"></script>
431431
<script type="text/javascript" src="/static/moment.min.js"></script>
432432
<script type="text/javascript" src="/static/dust-full-2.0.0.min.js"></script>

‎hadoop-hdfs-project/hadoop-hdfs/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,11 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
375375
<exclude>src/main/webapps/secondary/robots.txt</exclude>
376376
<exclude>src/contrib/**</exclude>
377377
<exclude>src/site/resources/images/*</exclude>
378-
<exclude>src/main/webapps/static/bootstrap-3.3.7/**</exclude>
378+
<exclude>src/main/webapps/static/bootstrap-3.4.1/**</exclude>
379379
<exclude>src/main/webapps/static/moment.min.js</exclude>
380380
<exclude>src/main/webapps/static/dust-full-2.0.0.min.js</exclude>
381381
<exclude>src/main/webapps/static/dust-helpers-1.1.1.min.js</exclude>
382-
<exclude>src/main/webapps/static/jquery-3.3.1.min.js</exclude>
382+
<exclude>src/main/webapps/static/jquery-3.4.1.min.js</exclude>
383383
<exclude>src/main/webapps/static/jquery.dataTables.min.js</exclude>
384384
<exclude>src/main/webapps/static/json-bignum.js</exclude>
385385
<exclude>src/main/webapps/static/dataTables.bootstrap.css</exclude>

‎hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<html xmlns="http://www.w3.org/1999/xhtml">
2020
<head>
2121
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
22-
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.3.7/css/bootstrap.min.css" />
22+
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.4.1/css/bootstrap.min.css" />
2323
<link rel="stylesheet" type="text/css" href="/static/hadoop.css" />
2424
<title>DataNode Information</title>
2525
</head>
@@ -125,8 +125,8 @@
125125
{/dn.VolumeInfo}
126126
</script>
127127

128-
<script type="text/javascript" src="/static/jquery-3.3.1.min.js"></script>
129-
<script type="text/javascript" src="/static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
128+
<script type="text/javascript" src="/static/jquery-3.4.1.min.js"></script>
129+
<script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js"></script>
130130
<script type="text/javascript" src="/static/moment.min.js"></script>
131131
<script type="text/javascript" src="/static/dust-full-2.0.0.min.js"></script>
132132
<script type="text/javascript" src="/static/dust-helpers-1.1.1.min.js"></script>

‎hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/dfshealth.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<html xmlns="http://www.w3.org/1999/xhtml">
2020
<head>
2121
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
22-
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.3.7/css/bootstrap.min.css" />
22+
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.4.1/css/bootstrap.min.css" />
2323
<link rel="stylesheet" type="text/css" href="/static/dataTables.bootstrap.css" />
2424
<link rel="stylesheet" type="text/css" href="/static/hadoop.css" />
2525
<title>Namenode information</title>
@@ -475,9 +475,9 @@
475475
</table>
476476
</script>
477477

478-
<script type="text/javascript" src="/static/jquery-3.3.1.min.js">
478+
<script type="text/javascript" src="/static/jquery-3.4.1.min.js">
479479
</script><script type="text/javascript" src="/static/jquery.dataTables.min.js">
480-
</script><script type="text/javascript" src="/static/bootstrap-3.3.7/js/bootstrap.min.js">
480+
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
481481
</script><script type="text/javascript" src="/static/dataTables.bootstrap.js">
482482
</script><script type="text/javascript" src="/static/moment.min.js">
483483
</script><script type="text/javascript" src="/static/dust-full-2.0.0.min.js">

‎hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<html xmlns="http://www.w3.org/1999/xhtml">
2020
<head>
2121
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
22-
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.3.7/css/bootstrap.min.css" />
23-
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.3.7/css/bootstrap-editable.css"/>
22+
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.4.1/css/bootstrap.min.css" />
23+
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.4.1/css/bootstrap-editable.css"/>
2424
<link rel="stylesheet" type="text/css" href="/static/dataTables.bootstrap.css" />
2525
<link rel="stylesheet" type="text/css" href="/static/hadoop.css" />
2626
<title>Browsing HDFS</title>
@@ -306,10 +306,10 @@ <h4 class="modal-title" id="delete-modal-title">Delete</h4>
306306
</ul>
307307
</p>
308308
</script>
309-
<script type="text/javascript" src="/static/jquery-3.3.1.min.js">
309+
<script type="text/javascript" src="/static/jquery-3.4.1.min.js">
310310
</script><script type="text/javascript" src="/static/jquery.dataTables.min.js">
311-
</script><script type="text/javascript" src="/static/bootstrap-3.3.7/js/bootstrap.min.js">
312-
</script><script type="text/javascript" src="/static/bootstrap-3.3.7/js/bootstrap-editable.min.js">
311+
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
312+
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap-editable.min.js">
313313
</script><script type="text/javascript" src="/static/dataTables.bootstrap.js">
314314
</script><script type="text/javascript" src="/static/dust-full-2.0.0.min.js">
315315
</script><script type="text/javascript" src="/static/dust-helpers-1.1.1.min.js">

‎hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/journal/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<html xmlns="http://www.w3.org/1999/xhtml">
2020
<head>
2121
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
22-
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.3.7/css/bootstrap.min.css" />
22+
<link rel="stylesheet" type="text/css" href="/static/bootstrap-3.4.1/css/bootstrap.min.css" />
2323
<link rel="stylesheet" type="text/css" href="/static/hadoop.css" />
2424
<title>JournalNode Information</title>
2525
</head>
@@ -51,8 +51,8 @@
5151
</div>
5252
</div>
5353

54-
<script type="text/javascript" src="/static/jquery-3.3.1.min.js">
55-
</script><script type="text/javascript" src="/static/bootstrap-3.3.7/js/bootstrap.min.js">
54+
<script type="text/javascript" src="/static/jquery-3.4.1.min.js">
55+
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
5656
</script>
5757
<script type="text/javascript">
5858
$('#authority').html(window.location.host);

‎hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/status.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<head>
2121
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
2222
<link rel="stylesheet" type="text/css"
23-
href="/static/bootstrap-3.3.7/css/bootstrap.min.css" />
23+
href="/static/bootstrap-3.4.1/css/bootstrap.min.css" />
2424
<link rel="stylesheet" type="text/css" href="/static/hadoop.css" />
2525
<title>SecondaryNamenode information</title>
2626
</head>
@@ -86,8 +86,9 @@
8686
{/snn}
8787
</script>
8888

89-
<script type="text/javascript" src="/static/jquery-3.3.1.min.js">
90-
</script><script type="text/javascript" src="/static/bootstrap-3.3.7/js/bootstrap.min.js">
89+
<script type="text/javascript" src="/static/jquery-3.4.1.min.js">
90+
</script><script type="text/javascript" src="/static/bootstrap-3.4.1/js/bootstrap.min.js">
91+
</script><script type="text/javascript" src="/static/moment.min.js">
9192
</script><script type="text/javascript" src="/static/dust-full-2.0.0.min.js">
9293
</script><script type="text/javascript" src="/static/dust-helpers-1.1.1.min.js">
9394
</script><script type="text/javascript" src="/static/dfs-dust.js">

‎hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.3.7/css/bootstrap-theme.css.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/bootstrap-3.3.7/css/bootstrap-theme.min.css.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)