[3/3] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456
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 HurleyAuthored: Tue Oct 18 23:02:47 2016 -0400 Committer: Jonathan Hurley 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(-) --
[3/3] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456
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/18c74125 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18c74125 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18c74125 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 18c74125a90169a88f712a7a48e15274e0fbb9e8 Parents: 10f44bc 9511638 Author: Jonathan HurleyAuthored: Wed Oct 12 10:41:42 2016 -0400 Committer: Jonathan Hurley Committed: Wed Oct 12 10:41:42 2016 -0400 -- .../server/controller/KerberosHelper.java | 40 +- .../server/controller/KerberosHelperImpl.java | 131 +-- .../AbstractPrepareKerberosServerAction.java| 38 +++--- .../ConfigureAmbariIdentitiesServerAction.java | 2 +- .../resources/stacks/HDP/2.0.6/kerberos.json| 40 -- .../stacks/HDP/2.3/services/HDFS/widgets.json | 12 +- .../server/controller/KerberosHelperTest.java | 84 7 files changed, 202 insertions(+), 145 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/18c74125/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java --
[3/3] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456
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/5cf5c834 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5cf5c834 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5cf5c834 Branch: refs/heads/branch-feature-AMBARI-18456 Commit: 5cf5c8349cef6e4605870ac59dd620db2053b02c Parents: 0de69e1 72f1f6f Author: Jonathan HurleyAuthored: Sat Oct 8 23:10:24 2016 -0400 Committer: Jonathan Hurley Committed: Sat Oct 8 23:10:24 2016 -0400 -- .../FALCON/0.5.0.2.1/package/scripts/falcon.py | 11 + .../4.0.0.2.0/package/scripts/oozie_service.py | 2 +- .../internal/UserResourceProviderDBTest.java| 280 +++ .../stacks/2.1/FALCON/test_falcon_server.py | 14 + 4 files changed, 306 insertions(+), 1 deletion(-) --