You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2018/01/17 21:48:14 UTC

[ambari] branch branch-feature-AMBARI-20859 updated (473df03 -> 9d33096)

This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a change to branch branch-feature-AMBARI-20859
in repository https://gitbox.apache.org/repos/asf/ambari.git.


    from 473df03  Merge pull request #120 from rlevas/branch-feature-AMBARI-20859
     add b2a61ec  AMBARI-22668. Moving LDAP related properties to DB upon upgrade to 3.0.0
     add 0c61412  AMBARI-22668: implemented changes requested by reviewers
     add 1e5d726  AMBARI-22668: implemented changes requested by rlevas
     add 23e51fa  Merge pull request #106 from smolnar82/AMBARI-22668
     add 7be21c9  AMBARI-22779. Cannot scale cluster if Ambari Server restarted since blueprint cluster creation
     add 79704f5  AMBARI-22789. Fix Log Search / Log Feeder / Infra Manager start scripts
     add 2dbb455  AMBARI-22787 - Add new Ambari Infra Manager component to Ambari infra stack
     add b8c0393  Merge pull request #124 from kasakrisz/infra-manager-stack-code
     add 7235069  AMBARI-22667: fix commons-io version
     add 47c8d29  AMBARI-22767. Kerberos wizard. Advanced kerberos-env password properties should be visible only if the KDC type is 'Active Directory' (alexantonenko)
     add 199e866  Merge pull request #92 from hiveww/AMBARI-22767-trunk
     add 4653253  AMBARI-22793. Notification popover layout issues
     add 9804cb2  Merge pull request #127 from hiveww/AMBARI-22793-trunk
     add a2a45aa  AMBARI-22794 Opacity decreased and the shadow has been added to the sticky filter bar.
     add 90b1438  AMBARI-22785: added force_tcp option to KRB5 configuration template so that customers can choose TCP over UDP when communicating with Kerberos
     add ad9bcb6  Merge pull request #129 from smolnar82/AMBARI-22785
     add 90b7c14  AMBARI-22726. Fix dependent tests in BlueprintImplTest (#133)
     add 6f4063b  Merge remote-tracking branch 'upstream/trunk' into branch-feature-AMBARI-20859
     add 5582d29  Merge remote-tracking branch 'upstream/trunk' into branch-feature-AMBARI-20859
     new 9d33096  Merge pull request #135 from rlevas/branch-feature-AMBARI-20859

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ambari-infra-manager/docker/bin/start.sh       |  2 +-
 .../docker/infra-manager-docker-compose.sh         |  5 ++
 .../archive/DocumentArchivingConfiguration.java    | 16 ++--
 ...rties.java => DocumentArchivingProperties.java} |  6 +-
 ...yMap.java => DocumentArchivingPropertyMap.java} | 16 ++--
 .../infra/job/archive/FileNameSuffixFormatter.java |  2 +-
 .../src/main/resources/infra-manager-env.sh        |  2 +-
 .../src/main/resources/infra-manager.properties    | 83 ++++++++++-----------
 .../src/main/resources/infraManager.sh             | 12 +--
 .../apache/ambari/infra/job/JobPropertiesTest.java | 26 +++----
 .../src/main/scripts/logfeeder.sh                  | 12 +--
 .../src/main/scripts/logsearch.sh                  | 12 +--
 .../logs-container/logs-container.component.less   |  3 +-
 ambari-project/pom.xml                             |  2 +-
 ambari-server/pom.xml                              |  1 -
 .../ambari/server/configuration/Configuration.java | 46 ++++++++++++
 .../ldap/domain/AmbariLdapConfigurationKeys.java   |  2 +-
 .../orm/entities/AmbariConfigurationEntity.java    |  2 +-
 .../ambari/server/topology/TopologyManager.java    |  5 +-
 .../ambari/server/upgrade/UpgradeCatalog300.java   | 86 ++++++++++++++++++++++
 .../KERBEROS/1.10.3-10/configuration/krb5-conf.xml | 11 +++
 .../KERBEROS/1.10.3-10/package/scripts/params.py   |  2 +
 .../KERBEROS/1.10.3-10/properties/krb5_conf.j2     |  3 +
 .../KERBEROS/1.10.3-30/configuration/krb5-conf.xml | 11 +++
 .../KERBEROS/1.10.3-30/package/scripts/params.py   |  2 +
 .../KERBEROS/1.10.3-30/properties/krb5_conf.j2     |  3 +
 .../LOGSEARCH/0.5.0/package/scripts/logfeeder.py   |  4 +-
 .../services/KERBEROS/configuration/krb5-conf.xml  | 11 +++
 .../services/KERBEROS/package/scripts/params.py    |  2 +
 .../1.0/services/KERBEROS/properties/krb5_conf.j2  |  3 +
 .../server/configuration/ConfigurationTest.java    | 36 +++++++++
 .../ambari/server/topology/BlueprintImplTest.java  | 26 +++----
 .../server/upgrade/UpgradeCatalog300Test.java      | 80 +++++++++++++++++---
 .../python/stacks/2.4/LOGSEARCH/test_logfeeder.py  |  2 +-
 .../main/admin/kerberos/step2_controller.js        |  4 +-
 .../main/admin/kerberos/wizard_controller.js       | 16 +++-
 ambari-web/app/styles/application.less             |  4 +
 .../main/alerts/alert_notifications_popup.hbs      | 30 ++++----
 .../main/admin/kerberos/step2_controller_test.js   |  2 +-
 39 files changed, 449 insertions(+), 144 deletions(-)
 rename ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/{DocumentExportProperties.java => DocumentArchivingProperties.java} (97%)
 rename ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/job/archive/{DocumentExportPropertyMap.java => DocumentArchivingPropertyMap.java} (69%)

-- 
To stop receiving notification emails like this one, please contact
['"commits@ambari.apache.org" <co...@ambari.apache.org>'].

[ambari] 01/01: Merge pull request #135 from rlevas/branch-feature-AMBARI-20859

Posted by rl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a commit to branch branch-feature-AMBARI-20859
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 9d3309656e7c1aa9fb00a732149a251f69eda51d
Merge: 473df03 5582d29
Author: Robert Levas <rl...@users.noreply.github.com>
AuthorDate: Wed Jan 17 16:48:11 2018 -0500

    Merge pull request #135 from rlevas/branch-feature-AMBARI-20859
    
    Merge remote-tracking branch 'upstream/trunk' into branch-feature-AMBARI-20859

 .../ambari-infra-manager/docker/bin/start.sh       |  2 +-
 .../docker/infra-manager-docker-compose.sh         |  5 ++
 .../archive/DocumentArchivingConfiguration.java    | 16 ++--
 ...rties.java => DocumentArchivingProperties.java} |  6 +-
 ...yMap.java => DocumentArchivingPropertyMap.java} | 16 ++--
 .../infra/job/archive/FileNameSuffixFormatter.java |  2 +-
 .../src/main/resources/infra-manager-env.sh        |  2 +-
 .../src/main/resources/infra-manager.properties    | 83 ++++++++++-----------
 .../src/main/resources/infraManager.sh             | 12 +--
 .../apache/ambari/infra/job/JobPropertiesTest.java | 26 +++----
 .../src/main/scripts/logfeeder.sh                  | 12 +--
 .../src/main/scripts/logsearch.sh                  | 12 +--
 .../logs-container/logs-container.component.less   |  3 +-
 ambari-project/pom.xml                             |  2 +-
 ambari-server/pom.xml                              |  1 -
 .../ambari/server/configuration/Configuration.java | 46 ++++++++++++
 .../ldap/domain/AmbariLdapConfigurationKeys.java   |  2 +-
 .../orm/entities/AmbariConfigurationEntity.java    |  2 +-
 .../ambari/server/topology/TopologyManager.java    |  5 +-
 .../ambari/server/upgrade/UpgradeCatalog300.java   | 86 ++++++++++++++++++++++
 .../KERBEROS/1.10.3-10/configuration/krb5-conf.xml | 11 +++
 .../KERBEROS/1.10.3-10/package/scripts/params.py   |  2 +
 .../KERBEROS/1.10.3-10/properties/krb5_conf.j2     |  3 +
 .../KERBEROS/1.10.3-30/configuration/krb5-conf.xml | 11 +++
 .../KERBEROS/1.10.3-30/package/scripts/params.py   |  2 +
 .../KERBEROS/1.10.3-30/properties/krb5_conf.j2     |  3 +
 .../LOGSEARCH/0.5.0/package/scripts/logfeeder.py   |  4 +-
 .../services/KERBEROS/configuration/krb5-conf.xml  | 11 +++
 .../services/KERBEROS/package/scripts/params.py    |  2 +
 .../1.0/services/KERBEROS/properties/krb5_conf.j2  |  3 +
 .../server/configuration/ConfigurationTest.java    | 36 +++++++++
 .../ambari/server/topology/BlueprintImplTest.java  | 26 +++----
 .../server/upgrade/UpgradeCatalog300Test.java      | 80 +++++++++++++++++---
 .../python/stacks/2.4/LOGSEARCH/test_logfeeder.py  |  2 +-
 .../main/admin/kerberos/step2_controller.js        |  4 +-
 .../main/admin/kerberos/wizard_controller.js       | 16 +++-
 ambari-web/app/styles/application.less             |  4 +
 .../main/alerts/alert_notifications_popup.hbs      | 30 ++++----
 .../main/admin/kerberos/step2_controller_test.js   |  2 +-
 39 files changed, 449 insertions(+), 144 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@ambari.apache.org" <co...@ambari.apache.org>.