Update git submodules
* Update system-config from branch 'master' - Merge "ask.o.o : workaround old puppet-solr package" - ask.o.o : workaround old puppet-solr package puppet-solr is dead upstream. Even the un-merged pull request for Xenial support isn't sufficient [1]. We can either get into the business of owning puppet-solr, or hack around it. It seems the major difference is that jetty package split into separate jetty[8|9] packages, and puppet-solr just uses "jetty" everywhere. This deb, created by equivs does the following * pre-depends on jetty8 * installs a symlink /etc/init.d/jetty -> jetty8 * symlinks in the webserver directory to /usr/share/jetty This appears to be enough to get things going. By pre-installing it, puppet-solr is happy enough to go on... [1] https://github.com/vamsee/puppet-solr/pull/33 Change-Id: Ie86303caeb26634434dc4b2d0d3f1195749a277e
This commit is contained in:
parent
1bf3493f58
commit
535ededb2d
|
@ -1 +1 @@
|
|||
Subproject commit 82e498fb59a54272a5e9fcdfa9bd09c3e9b92b0d
|
||||
Subproject commit e740439103ac89293a63873ebfd2f63d33b09379
|
Loading…
Reference in New Issue