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 Hurley <jhur...@hortonworks.com>
Authored: Sat Oct 8 23:10:24 2016 -0400
Committer: Jonathan Hurley <jhur...@hortonworks.com>
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(-)
----------------------------------------------------------------------


Reply via email to