You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2019/12/23 11:27:28 UTC
[hadoop] branch branch-3.1 updated: YARN-10055. bower install
fails. (#1778)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 01edc65 YARN-10055. bower install fails. (#1778)
01edc65 is described below
commit 01edc654df25b26b390b3bfa3fbbd54e872d7b79
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Mon Dec 23 19:45:47 2019 +0900
YARN-10055. bower install fails. (#1778)
(cherry picked from commit 34ff7dbaf53cbbebcb163980f4b45221630c2882)
---
.../hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json | 2 +-
.../hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
index 8fa9668..9b5cc9f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/bower.json
@@ -23,6 +23,6 @@
"select2": "4.0.0",
"snippet-ss": "~1.11.0",
"alasql": "^0.4.3",
- "abdmob/x2js": "1.2.0"
+ "x2js": "1.2.0"
}
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
index 309c53b..c4bb95f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
@@ -51,7 +51,7 @@ module.exports = function(defaults) {
app.import('bower_components/bootstrap/dist/css/bootstrap-theme.css');
app.import('bower_components/bootstrap/dist/js/bootstrap.min.js');
app.import('bower_components/alasql/dist/alasql.js');
- app.import('bower_components/abdmob/x2js/xml2json.js');
+ app.import('bower_components/x2js/xml2json.js');
// Use `app.import` to add additional libraries to the generated
// output files.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org