Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 a336561e2 -> 58a5ee378


YARN-8083. [UI2] All YARN related configurations are paged together in conf 
page. Contributed by Gergely Novák.

(cherry picked from commit b17dc9f5f54fd91defc1d8646f8229da5fe7ccbb)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/58a5ee37
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58a5ee37
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58a5ee37

Branch: refs/heads/branch-3.1
Commit: 58a5ee378ab04013a08333595ee4c330479ed79c
Parents: a336561
Author: Sunil G <sun...@apache.org>
Authored: Fri Apr 6 21:53:14 2018 +0530
Committer: Sunil G <sun...@apache.org>
Committed: Fri Apr 6 21:53:49 2018 +0530

----------------------------------------------------------------------
 .../main/webapp/app/controllers/yarn-tools/yarn-conf.js   | 10 +++++++++-
 .../main/webapp/app/templates/yarn-tools/yarn-conf.hbs    |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/58a5ee37/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
index 2984346..cc3be2e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/yarn-tools/yarn-conf.js
@@ -24,7 +24,15 @@ import ColumnDef from 'em-table/utils/column-definition';
 import YarnConf from '../../models/yarn-conf';
 
 export default Ember.Controller.extend({
-  tableDefinition: TableDef.create({
+  coreTableDefinition: TableDef.create({
+    searchType: 'manual',
+  }),
+
+  mapredTableDefinition: TableDef.create({
+    searchType: 'manual',
+  }),
+
+  yarnTableDefinition: TableDef.create({
     searchType: 'manual',
   }),
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/58a5ee37/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
index 09a1410..c2108a2 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-tools/yarn-conf.hbs
@@ -17,12 +17,12 @@
 }}
 
 <h1>Core Configuration</h1>
-{{em-table columns=columnsFromModel rows=rowsForCoreColumnsFromModel 
rowCount=10 definition=tableDefinition}}
+{{em-table columns=columnsFromModel rows=rowsForCoreColumnsFromModel 
rowCount=10 definition=coreTableDefinition}}
 
 <h1>YARN Configuration</h1>
-{{em-table columns=columnsFromModel rows=rowsForYarnColumnsFromModel 
rowCount=10 definition=tableDefinition}}
+{{em-table columns=columnsFromModel rows=rowsForYarnColumnsFromModel 
rowCount=10 definition=yarnTableDefinition}}
 
 <h1>MapReduce Configuration</h1>
-{{em-table columns=columnsFromModel rows=rowsForMapredColumnsFromModel 
rowCount=10 definition=tableDefinition}}
+{{em-table columns=columnsFromModel rows=rowsForMapredColumnsFromModel 
rowCount=10 definition=mapredTableDefinition}}
 
 {{outlet}}


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to