ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [5/5] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456
Date Wed, 05 Oct 2016 12:37:08 GMT
Merge branch 'trunk' into branch-feature-AMBARI-18456


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/42c61263
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/42c61263
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/42c61263

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 42c6126332bc77dc8c0a5366f5e8cac8c7779df2
Parents: 5467ad0 a901d8a
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Wed Oct 5 08:33:46 2016 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Wed Oct 5 08:33:46 2016 -0400

----------------------------------------------------------------------
 .../state/cluster/ClustersDeadlockTest.java     | 137 +++++---
 ambari-web/app/controllers/wizard.js            |  14 +-
 .../app/controllers/wizard/step7_controller.js  |  20 +-
 ambari-web/app/utils/config.js                  |  20 ++
 ambari-web/test/controllers/wizard_test.js      |  97 +-----
 .../src/main/resources/ui/app/components.js     |   2 +
 .../ui/app/components/labelCapacityBar.js       |  12 +-
 .../resources/ui/app/components/queueBadge.js   |   6 +-
 .../ui/app/components/queueHierarchy.js         |  11 +
 .../resources/ui/app/components/queueMapping.js |  25 +-
 .../resources/ui/app/components/queueSummary.js |  23 +-
 .../ui/app/components/sunburstChart.js          | 339 +++++++++++++++++++
 .../ui/app/components/xmldiffViewer.js          | 101 ++++++
 .../resources/ui/app/controllers/advanced.js    |  21 +-
 .../resources/ui/app/controllers/capsched.js    |  39 ++-
 .../resources/ui/app/controllers/editqueue.js   |  66 +++-
 .../resources/ui/app/controllers/queuesconf.js  | 106 +++++-
 .../resources/ui/app/controllers/scheduler.js   |  21 +-
 .../src/main/resources/ui/app/models/queue.js   |   9 +-
 .../src/main/resources/ui/app/router.js         |  49 ++-
 .../resources/ui/app/styles/application.less    |  59 ++++
 .../src/main/resources/ui/app/templates.js      |   2 +
 .../resources/ui/app/templates/capsched.hbs     |   6 +
 .../ui/app/templates/capsched/advanced.hbs      |  13 +-
 .../capsched/partials/accessControlList.hbs     |   4 +-
 .../capsched/partials/labelCapacity.hbs         |   4 +-
 .../templates/capsched/partials/preemption.hbs  |   4 +-
 .../capsched/partials/queueCapacity.hbs         |  34 +-
 .../capsched/partials/queueResources.hbs        |   4 +-
 .../ui/app/templates/capsched/queuesconf.hbs    |  15 +-
 .../ui/app/templates/capsched/scheduler.hbs     |   6 +-
 .../app/templates/components/queueHierarchy.hbs |   8 +-
 .../app/templates/components/queueMapping.hbs   |  14 +-
 .../app/templates/components/queueSummary.hbs   |  13 -
 .../app/templates/components/sunburstChart.hbs  |  44 +++
 .../app/templates/components/xmldiffViewer.hbs  |  41 +++
 .../src/main/resources/ui/bower.json            |  13 +-
 37 files changed, 1145 insertions(+), 257 deletions(-)
----------------------------------------------------------------------



Mime
View raw message