Merge branch 'trunk' into branch-alerts-dev
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9919b3f4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9919b3f4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9919b3f4 Branch: refs/heads/trunk Commit: 9919b3f4faf0ead6d7495d28e910f21cbc0f42f5 Parents: 445a53c 76e3bb4 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Mon Oct 6 11:12:39 2014 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Mon Oct 6 11:12:39 2014 -0400 ---------------------------------------------------------------------- .../src/main/python/ambari_agent/Facter.py | 17 ++-- .../src/main/python/ambari_commons/os_check.py | 17 ++++ .../ambari/server/agent/HeartBeatHandler.java | 1 + .../ViewInstanceResourceDefinition.java | 5 +- .../server/api/services/AmbariMetaInfo.java | 2 +- .../apache/ambari/server/view/ViewRegistry.java | 35 ++++---- .../src/main/python/ambari_server/utils.py | 4 +- ambari-server/src/main/resources/os_family.json | 6 ++ .../services/OOZIE/package/scripts/oozie.py | 2 +- .../services/OOZIE/package/scripts/params.py | 2 - .../ZOOKEEPER/configuration/zookeeper-env.xml | 1 + .../ZOOKEEPER/package/scripts/params.py | 2 + .../services/OOZIE/configuration/oozie-site.xml | 75 +++++++++++++++++ .../ambari/server/view/ViewRegistryTest.java | 28 +++--- .../stacks/2.0.6/OOZIE/test_oozie_server.py | 10 +++ .../templates/main/service/services/storm.hbs | 2 +- .../app/views/main/service/services/storm.js | 8 ++ .../ui/app/controllers/slider_app_controller.js | 89 ++++++++++++-------- .../main/resources/ui/app/models/slider_app.js | 33 ++++---- .../ui/test/integration/pages/index_test.js | 13 ++- .../controllers/slider_app_controller_test.js | 64 ++++++++++++++ 21 files changed, 322 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9919b3f4/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9919b3f4/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java ----------------------------------------------------------------------
