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

[ambari] 01/01: Merge pull request #1064 from oleewere/AMBARI-23649-trunk

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

oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 873c84b12ac4a2d3b98b5d083219e05b39018559
Merge: dcdcb03 87e8daa
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Sat Apr 21 18:37:43 2018 +0200

    Merge pull request #1064 from oleewere/AMBARI-23649-trunk
    
    [AMBARI-23649] Upgrade Solr version from 7.2.1 to 7.3.0

 .../ambari-infra-manager/docker/docker-compose.yml |  2 +-
 .../docker/infra-manager-docker-compose.sh         |  2 +-
 .../src/main/python/migrationHelper.py             |  2 +-
 .../src/main/resources/solrIndexHelper.sh          |  8 ++++----
 .../docker/infra-solr-docker-compose.sh            |  2 +-
 ambari-infra/pom.xml                               |  2 +-
 .../main/configsets/audit_logs/conf/managed-schema |  8 ++++----
 .../main/configsets/audit_logs/conf/solrconfig.xml |  2 +-
 .../configsets/hadoop_logs/conf/managed-schema     |  4 ++--
 .../configsets/hadoop_logs/conf/solrconfig.xml     |  2 +-
 .../main/configsets/history/conf/managed-schema    |  4 ++--
 .../main/configsets/history/conf/solrconfig.xml    |  2 +-
 .../org/apache/ambari/logsearch/util/SolrUtil.java | 22 +++++++++++-----------
 ambari-logsearch/docker/Dockerfile                 |  2 +-
 ambari-logsearch/docker/docker-compose.yml         |  2 +-
 ambari-logsearch/docker/logsearch-docker.sh        |  2 +-
 ambari-logsearch/docker/solr.yml                   |  2 +-
 ambari-logsearch/docker/sso.yml                    |  2 +-
 ambari-logsearch/pom.xml                           |  2 +-
 .../ambari/server/upgrade/UpgradeCatalog270.java   |  4 ++--
 .../0.1.0/package/scripts/command_commons.py       |  2 +-
 .../0.5.0/properties/audit_logs-solrconfig.xml.j2  |  2 +-
 .../properties/service_logs-solrconfig.xml.j2      |  2 +-
 .../server/upgrade/UpgradeCatalog270Test.java      |  4 ++--
 24 files changed, 44 insertions(+), 44 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
oleewere@apache.org.