ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rle...@apache.org
Subject [34/34] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-20859
Date Mon, 26 Jun 2017 13:58:08 GMT
Merge branch 'trunk' into branch-feature-AMBARI-20859


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 12ae2591574c811311b24e2158261a0980548f68
Parents: fd32200 23cc628
Author: Robert Levas <rlevas@hortonworks.com>
Authored: Mon Jun 26 09:57:20 2017 -0400
Committer: Robert Levas <rlevas@hortonworks.com>
Committed: Mon Jun 26 09:57:20 2017 -0400

----------------------------------------------------------------------
 .../logsearch/config/api/LogSearchConfig.java   |    8 +
 .../model/inputconfig/FilterGrokDescriptor.java |    2 +
 .../config/api/LogSearchConfigClass1.java       |    5 +
 .../config/api/LogSearchConfigClass2.java       |    5 +
 .../config/zookeeper/LogSearchConfigZK.java     |    9 +-
 .../impl/FilterGrokDescriptorImpl.java          |    1 +
 .../ambari-logsearch-logfeeder/pom.xml          |    5 +
 .../org/apache/ambari/logfeeder/LogFeeder.java  |   55 +-
 .../ambari/logfeeder/LogFeederCommandLine.java  |  168 +
 .../ambari/logfeeder/common/ConfigHandler.java  |   26 +
 .../logfeeder/common/LogEntryParseTester.java   |  127 +
 .../ambari/logfeeder/filter/FilterGrok.java     |    5 +-
 .../apache/ambari/logfeeder/input/Input.java    |    2 +-
 .../apache/ambari/logfeeder/util/AliasUtil.java |    6 +-
 .../apache/ambari/logfeeder/util/FileUtil.java  |   23 +-
 .../ambari/logfeeder/util/LogFeederUtil.java    |   26 +-
 .../src/main/scripts/run.sh                     |    4 +-
 .../logconfig/LogConfigHandlerTest.java         |    2 +-
 .../logfeeder/metrics/MetrcisManagerTest.java   |  128 -
 .../logfeeder/metrics/MetricsManagerTest.java   |  128 +
 .../ambari-logsearch-server/pom.xml             |   27 +
 .../ambari/logsearch/doc/DocConstants.java      |    1 +
 .../logsearch/manager/ShipperConfigManager.java |   24 +
 .../logsearch/rest/ShipperConfigResource.java   |   12 +
 .../timeline/AbstractTimelineMetricsSink.java   |   25 +-
 .../cache/HandleConnectExceptionTest.java       |   86 +-
 .../timeline/HBaseTimelineMetricStore.java      |    6 +-
 .../timeline/TimelineMetricConfiguration.java   |   10 +
 ambari-server/src/main/assemblies/server.xml    |    4 +
 .../system/impl/AmbariMetricSinkImpl.java       |    3 +
 .../system/impl/DatabaseMetricsSource.java      |    4 +-
 .../metrics/system/impl/JvmMetricsSource.java   |   12 +-
 .../metrics/system/impl/MetricsServiceImpl.java |    5 +-
 .../server/upgrade/SchemaUpgradeHelper.java     |   13 -
 .../server/upgrade/UpgradeCatalog200.java       |  613 ----
 .../server/upgrade/UpgradeCatalog210.java       | 1765 ----------
 .../server/upgrade/UpgradeCatalog211.java       |  295 --
 .../server/upgrade/UpgradeCatalog212.java       |  427 ---
 .../server/upgrade/UpgradeCatalog2121.java      |  206 --
 .../server/upgrade/UpgradeCatalog220.java       | 1404 --------
 .../server/upgrade/UpgradeCatalog221.java       |  456 ---
 .../server/upgrade/UpgradeCatalog222.java       |  781 -----
 .../server/upgrade/UpgradeCatalog230.java       |  402 ---
 .../server/upgrade/UpgradeCatalog240.java       | 3080 ------------------
 .../server/upgrade/UpgradeCatalog2402.java      |  121 -
 .../server/upgrade/UpgradeCatalog242.java       |  272 --
 .../server/upgrade/UpgradeCatalog250.java       | 1352 --------
 .../server/upgrade/UpgradeCatalog300.java       |    5 +-
 ambari-server/src/main/python/upgradeHelper.py  | 2338 -------------
 .../0.6.0.2.5/package/scripts/master.py         |   21 +-
 .../0.6.0.2.5/package/scripts/params.py         |   23 +
 .../catalog/UpgradeCatalog_1.3_to_2.2.json      |  948 ------
 .../catalog/UpgradeCatalog_2.0_to_2.2.2.json    |  408 ---
 .../catalog/UpgradeCatalog_2.0_to_2.2.4.json    |  453 ---
 .../catalog/UpgradeCatalog_2.0_to_2.2.json      |  275 --
 .../catalog/UpgradeCatalog_2.1_to_2.2.2.json    |  465 ---
 .../catalog/UpgradeCatalog_2.1_to_2.2.4.json    |  499 ---
 .../catalog/UpgradeCatalog_2.1_to_2.2.json      |  292 --
 .../catalog/UpgradeCatalog_2.1_to_2.3.json      |  440 ---
 .../catalog/UpgradeCatalog_2.2_to_2.3.json      | 2234 -------------
 .../UpgradeCatalog_2.2_to_2.3_step2.json        |   81 -
 .../ambari/server/orm/DBAccessorImplTest.java   |    1 -
 .../server/upgrade/UpgradeCatalog200Test.java   |  915 ------
 .../server/upgrade/UpgradeCatalog210Test.java   | 1360 --------
 .../server/upgrade/UpgradeCatalog211Test.java   |  446 ---
 .../server/upgrade/UpgradeCatalog2121Test.java  |  161 -
 .../server/upgrade/UpgradeCatalog212Test.java   |  694 ----
 .../server/upgrade/UpgradeCatalog220Test.java   | 1535 ---------
 .../server/upgrade/UpgradeCatalog221Test.java   |  614 ----
 .../server/upgrade/UpgradeCatalog222Test.java   | 1180 -------
 .../server/upgrade/UpgradeCatalog230Test.java   |  317 --
 .../server/upgrade/UpgradeCatalog240Test.java   | 2687 ---------------
 .../server/upgrade/UpgradeCatalog242Test.java   |  430 ---
 .../server/upgrade/UpgradeCatalog250Test.java   | 2129 ------------
 .../server/upgrade/UpgradeCatalog300Test.java   |    2 +-
 .../server/upgrade/UpgradeCatalogTest.java      |   13 +-
 .../global/wizard_watcher_controller.js         |    6 +-
 ambari-web/app/messages.js                      |    2 +-
 .../global/wizard_watcher_controller_test.js    |    3 +-
 docs/pom.xml                                    |   12 +
 80 files changed, 813 insertions(+), 32317 deletions(-)
----------------------------------------------------------------------



Mime
View raw message