From a31c45528267967309266c960d083b7e641c8254 Mon Sep 17 00:00:00 2001 From: Rodolfo Zitellini Date: Wed, 16 Feb 2022 09:32:59 +0100 Subject: [PATCH] Revert install message and fix changelog --- 2- INSTALL.rdoc | 7 +------ CHANGELOG | 13 +++++++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/2- INSTALL.rdoc b/2- INSTALL.rdoc index 91b7d9a90..1a466279f 100644 --- a/2- INSTALL.rdoc +++ b/2- INSTALL.rdoc @@ -144,6 +144,7 @@ The Muscat core should work with any installation of Solr, here a sample install ==== Installation using a "stock" solr using included setup script +*NOTE:* this was tested on Linux distributions only. Grab a copy of the official distribution (8.11.1 at the time of writing) and unpack it in a suitable place wget https://www.apache.org/dyn/closer.lua/lucene/solr/8.11.1/solr-8.11.1.tgz?action=download -O solr-8.11.1.tgz @@ -154,12 +155,6 @@ Extract just the installation script: tar xzf solr-8.11.1.tgz solr-8.11.1/bin/install_solr_service.sh --strip-components=2 -On MacOS do - - tar xzf solr-8.11.1.tgz solr-8.11.1/bin/install_solr_service.sh - mv solr-8.11.1/bin/install_solr_service.sh . - rmdir solr-8.11.1/bin solr-8.11.1 - And execute it: sudo ./install_solr_service.sh solr-8.11.1.tgz -d /data/solr -p 8983 diff --git a/CHANGELOG b/CHANGELOG index e61310b46..002ff48f9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,19 @@ Muscat Changelog ================ +v 8.0.2 +* Exclude linked -zsh field from import everywhere +* Merge pull request #1198 from rism-digital/8.0-fix-viaf +* Fixed: Add Themax jar path +* Merge pull request #1203 from rism-digital/add-themax-path +* Bump puma from 5.5.1 to 5.6.2 +* Include new translations + some utility functions +* Merge pull request #1214 from rism-digital/dependabot/bundler/puma-5.6.2 +* Disable SAML template +* Fix #1215 +* Fix #1216, update Solr versions +* Update to rails 5.2.6.2 for CVE-2022-23633 + v 8.0.1 * Update e-mail message * Merge pull request #1184 from rism-digital/email-message-update