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/159ad003
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/159ad003
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/159ad003

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: 159ad00328af9ed7a7b7130904d53210a7b41146
Parents: 532caef 7be0418
Author: Jonathan Hurley <jhur...@hortonworks.com>
Authored: Tue Oct 18 23:02:47 2016 -0400
Committer: Jonathan Hurley <jhur...@hortonworks.com>
Committed: Tue Oct 18 23:02:47 2016 -0400

----------------------------------------------------------------------
 .gitignore                                      |  1 +
 ambari-admin/pom.xml                            |  2 +-
 .../main/resources/ui/admin-web/package.json    |  2 +-
 ambari-agent/conf/unix/ambari-agent.ini         |  1 -
 .../src/main/python/ambari_agent/ActionQueue.py | 16 +------
 .../ambari_agent/PythonReflectiveExecutor.py    | 25 +++-------
 .../test/python/ambari_agent/TestActionQueue.py |  3 +-
 .../main/python/ambari_commons/thread_utils.py  | 43 -----------------
 ambari-web/app/styles/common.less               | 10 ++--
 ambari-web/karma.conf.js                        |  4 +-
 ambari-web/package.json                         |  9 ++--
 ambari-web/pom.xml                              | 49 ++++++++++++++++----
 contrib/views/capacity-scheduler/pom.xml        |  4 +-
 .../src/main/resources/ui/package.json          |  2 +-
 contrib/views/files/pom.xml                     |  4 +-
 contrib/views/hawq/pom.xml                      |  2 +-
 contrib/views/hive-next/pom.xml                 |  4 +-
 .../src/main/resources/ui/hive-web/package.json |  2 +-
 contrib/views/hive/pom.xml                      |  4 +-
 .../src/main/resources/ui/hive-web/package.json |  2 +-
 contrib/views/hueambarimigration/pom.xml        |  4 +-
 contrib/views/jobs/pom.xml                      |  4 +-
 contrib/views/pig/pom.xml                       |  4 +-
 .../src/main/resources/ui/pig-web/package.json  |  2 +-
 contrib/views/wfmanager/pom.xml                 |  4 +-
 25 files changed, 83 insertions(+), 124 deletions(-)
----------------------------------------------------------------------


Reply via email to