ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [6/6] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556
Date Wed, 19 Apr 2017 15:05:37 GMT
Merge branch 'trunk' into branch-feature-AMBARI-12556


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 3bd91a2f7968cb182d005a3b45879261297b4495
Parents: 56f838b f516b6c
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Wed Apr 19 11:04:49 2017 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Wed Apr 19 11:04:49 2017 -0400

----------------------------------------------------------------------
 .../stackVersions/StackVersionsEditCtrl.js      | 102 ++++--------------
 .../timeline/HadoopTimelineMetricsSink.java     |   4 +
 .../ambari-metrics-timelineservice/pom.xml      |   2 +-
 .../timeline/HBaseTimelineMetricStore.java      |   5 +
 .../metrics/timeline/PhoenixHBaseAccessor.java  | 106 +++++++++++++++++++
 .../metrics/timeline/TimelineMetricStore.java   |   8 ++
 .../TimelineMetricClusterAggregatorSecond.java  |   1 +
 .../TimelineMetricMetadataManager.java          |  38 +++++++
 .../discovery/TimelineMetricMetadataSync.java   |  57 ++++++++++
 .../timeline/query/PhoenixTransactSQL.java      |  12 +++
 .../webapp/TimelineWebServices.java             |  16 +++
 .../timeline/TestTimelineMetricStore.java       |   5 +
 .../timeline/discovery/TestMetadataManager.java |   8 ++
 .../timeline/discovery/TestMetadataSync.java    |  12 +++
 .../ambari/server/actionmanager/Stage.java      |   2 +-
 .../ambari/server/agent/HeartBeatResponse.java  |   3 -
 .../ambari/server/api/query/JpaSortBuilder.java |   2 +-
 .../RequestScheduleResourceDefinition.java      |   6 +-
 .../server/api/rest/BootStrapResource.java      |   2 +-
 .../api/services/AlertDefinitionService.java    |   3 -
 .../ambari/server/checks/ServicesUpCheck.java   |   2 -
 .../server/configuration/Configuration.java     |  52 ++-------
 .../internal/AbstractProviderModule.java        |   2 +-
 .../internal/UpgradeResourceProvider.java       |   5 +-
 .../VersionDefinitionResourceProvider.java      |   1 -
 .../events/AlertDefinitionDisabledEvent.java    |   2 +-
 .../EntityManagerCacheInvalidationEvent.java    |   5 -
 .../listeners/alerts/AlertReceivedListener.java |   2 +-
 .../apache/ambari/server/orm/DBAccessor.java    |   3 +-
 .../ambari/server/orm/dao/ExtensionDAO.java     |   2 +-
 .../ambari/server/orm/dao/ExtensionLinkDAO.java |   3 +-
 .../ambari/server/orm/dao/RequestDAO.java       |   4 +-
 .../orm/entities/AlertDefinitionEntity.java     |   2 +-
 .../server/orm/entities/UpgradeEntity.java      |   3 -
 .../server/orm/entities/UpgradeGroupEntity.java |   2 +-
 .../server/orm/entities/ViewURLEntity.java      |   1 -
 .../server/orm/helpers/dbms/DbmsHelper.java     |   1 -
 .../authorization/LdapServerProperties.java     |   4 +-
 .../apache/ambari/server/stack/StackModule.java |   2 +-
 .../org/apache/ambari/server/state/Cluster.java |   3 +-
 .../apache/ambari/server/state/ConfigImpl.java  |   2 +-
 .../server/state/alert/AlertDefinitionHash.java |   2 -
 .../server/state/cluster/ClusterImpl.java       |   2 +-
 .../state/configgroup/ConfigGroupFactory.java   |  15 +--
 .../state/configgroup/ConfigGroupImpl.java      |   8 --
 .../server/state/fsm/StateMachineFactory.java   |   4 +-
 .../state/repository/VersionDefinitionXml.java  |   1 -
 .../state/services/MetricsRetrievalService.java |   6 +-
 .../state/stack/upgrade/HostOrderGrouping.java  |   1 -
 .../server/state/stack/upgrade/TaskWrapper.java |   8 +-
 .../server/upgrade/UpgradeCatalog300.java       |   2 +-
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  10 ++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  37 ++++---
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |   2 +
 .../server/api/query/JpaSortBuilderTest.java    |   4 -
 .../apache/ambari/server/events/EventsTest.java |   4 -
 .../apache/ambari/server/orm/OrmTestHelper.java |   8 --
 .../server/orm/dao/HostRoleCommandDAOTest.java  |   2 -
 .../state/alerts/AlertDefinitionHashTest.java   |   2 +-
 .../state/alerts/AlertEventPublisherTest.java   |   3 -
 .../state/alerts/InitialAlertEventTest.java     |   3 -
 ...omponentHostConcurrentWriteDeadlockTest.java |   4 -
 62 files changed, 371 insertions(+), 254 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3bd91a2f/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/3bd91a2f/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/3bd91a2f/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/3bd91a2f/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/3bd91a2f/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java
----------------------------------------------------------------------


Mime
View raw message