jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/393788 )
Change subject: Revert "Merge "Fix .gitreview for compat branch" into trusty-compat" ...................................................................... Revert "Merge "Fix .gitreview for compat branch" into trusty-compat" This reverts commit a92d9b0ea6ed283a950ad198934623acdf7c65f0, reversing changes made to 81fd32c95c0c08c12ea740cc86f931c965798731. Bug: T171537 Change-Id: Idaa4775223c09f7eb001e64634d2a3231024bb1d --- M .gitmodules M .rubocop.yml M Gemfile M Gemfile.lock M Vagrantfile A lib/labs-vagrant.rb M lib/mediawiki-vagrant/lsb_check/provisioner.rb M puppet/hieradata/common.yaml M puppet/hieradata/provider/lxc.yaml M puppet/modules/apache/manifests/init.pp M puppet/modules/apache/manifests/mod/access_compat.pp M puppet/modules/apache/manifests/mod/proxy_fcgi.pp A puppet/modules/apache/manifests/mod/version.pp M puppet/modules/apache/templates/ports.conf.erb M puppet/modules/apt/manifests/init.pp M puppet/modules/apt/manifests/ppa.pp D puppet/modules/apt/templates/backports.list.erb M puppet/modules/apt/templates/mwv-apt.list.erb M puppet/modules/apt/templates/wikimedia.list.erb M puppet/modules/browsertests/manifests/bundle.pp M puppet/modules/browsertests/manifests/init.pp A puppet/modules/cgroup/files/cgrulesengd.conf M puppet/modules/cgroup/manifests/init.pp D puppet/modules/cgroup/templates/systemd/cgrulesengd.erb M puppet/modules/citoid/manifests/init.pp M puppet/modules/elasticsearch/manifests/init.pp M puppet/modules/eventlogging/manifests/devserver.pp M puppet/modules/eventlogging/manifests/service.pp A puppet/modules/eventlogging/templates/devserver.upstart.erb A puppet/modules/eventlogging/templates/service.upstart.erb D puppet/modules/eventlogging/templates/systemd/eventlogging-devserver.erb D puppet/modules/eventlogging/templates/systemd/eventlogging-service.erb M puppet/modules/git/manifests/init.pp A puppet/modules/hhvm/files/hhvm.conf D puppet/modules/hhvm/manifests/fcgi.pp M puppet/modules/hhvm/manifests/init.pp D puppet/modules/hhvm/templates/systemd/hhvm.erb A puppet/modules/kafka/files/upstart M puppet/modules/kafka/manifests/init.pp D puppet/modules/kafka/templates/log4j.properties.erb D puppet/modules/kafka/templates/systemd/kafka.erb A puppet/modules/mariadb M puppet/modules/mediawiki/manifests/apache.pp M puppet/modules/mediawiki/manifests/init.pp M puppet/modules/mediawiki/manifests/jobrunner.pp D puppet/modules/mediawiki/manifests/ready_service.pp A puppet/modules/mediawiki/templates/jobchron.conf.erb A puppet/modules/mediawiki/templates/jobrunner.conf.erb M puppet/modules/mediawiki/templates/jobrunner.json.erb A puppet/modules/mediawiki/templates/mediawiki-bridge.conf.erb D puppet/modules/mediawiki/templates/systemd/jobchron.erb D puppet/modules/mediawiki/templates/systemd/jobrunner.erb D puppet/modules/mediawiki/templates/systemd/mediawiki-ready.erb D puppet/modules/mediawiki/templates/wait-for-mediawiki.sh.erb M puppet/modules/misc/files/mediawiki_vagrant_motd M puppet/modules/misc/manifests/init.pp M puppet/modules/motd/manifests/init.pp D puppet/modules/mwv/manifests/cachefilesd.pp M puppet/modules/mwv/manifests/init.pp D puppet/modules/mwv/manifests/packages.pp M puppet/modules/nginx M puppet/modules/npm/files/nodesource.sources.list M puppet/modules/payments/files/Main_Page.wiki M puppet/modules/postfix/manifests/init.pp D puppet/modules/role/files/keystone/logging.conf D puppet/modules/role/files/keystone/policy.json D puppet/modules/role/files/keystone/use-openstack D puppet/modules/role/files/keystone/wmfkeystonehooks.egg-info/PKG-INFO D puppet/modules/role/files/keystone/wmfkeystonehooks.egg-info/entry_points.txt D puppet/modules/role/files/keystone/wmfkeystonehooks/__init__.py D puppet/modules/role/files/keystone/wmfkeystonehooks/wmfkeystonehooks.py D puppet/modules/role/files/striker/20160916-01-initial.sql M puppet/modules/role/manifests/cirrussearch.pp M puppet/modules/role/manifests/citoid.pp D puppet/modules/role/manifests/keystone.pp M puppet/modules/role/manifests/ores.pp M puppet/modules/role/manifests/striker.pp M puppet/modules/role/manifests/timedmediahandler.pp D puppet/modules/role/manifests/timeless.pp A puppet/modules/role/manifests/trafficserver.pp A puppet/modules/role/manifests/zotero.pp A puppet/modules/role/settings/trafficserver.yaml M puppet/modules/role/templates/elk/VagrantRoleElk.wiki.erb M puppet/modules/role/templates/elk/monolog.php.erb D puppet/modules/role/templates/keystone/admin-openrc.erb D puppet/modules/role/templates/keystone/bootstrap_keystone.erb D puppet/modules/role/templates/keystone/keystone.conf.erb M puppet/modules/role/templates/swift/apache2.conf.erb M puppet/modules/role/templates/wikidata/shared.php.erb M puppet/modules/rsyslog/manifests/init.pp M puppet/modules/ruby/manifests/bundle.pp A puppet/modules/ruby/manifests/default.pp A puppet/modules/ruby/manifests/gem.pp M puppet/modules/ruby/manifests/init.pp A puppet/modules/ruby/manifests/ruby.pp M puppet/modules/sentry/manifests/init.pp D puppet/modules/sentry/templates/systemd/sentry-server.erb D puppet/modules/sentry/templates/systemd/sentry-worker.erb A puppet/modules/sentry/templates/upstart-server.erb A puppet/modules/sentry/templates/upstart-worker.erb M puppet/modules/service/manifests/node.pp A puppet/modules/service/templates/node/upstart.conf.erb D puppet/modules/service/templates/systemd/node.erb M puppet/modules/statsd/manifests/init.pp D puppet/modules/statsd/templates/systemd/statsd.erb A puppet/modules/statsd/templates/upstart.conf.erb M puppet/modules/swift/manifests/init.pp M puppet/modules/swift/manifests/ring.pp M puppet/modules/swift/manifests/service.pp M puppet/modules/swift/templates/conf.php.erb M puppet/modules/swift/templates/proxy-server.conf.erb D puppet/modules/swift/templates/systemd/swift.erb A puppet/modules/swift/templates/upstart.erb D puppet/modules/systemd/manifests/service.pp M puppet/modules/thumbor/manifests/init.pp M puppet/modules/thumbor/manifests/service.pp M puppet/modules/thumbor/templates/20-thumbor-wikimedia.conf.erb D puppet/modules/thumbor/templates/systemd/thumbor.erb D puppet/modules/thumbor/templates/thumbor.tmpfiles.d.erb A puppet/modules/thumbor/templates/upstart.erb A puppet/modules/trafficserver/manifests/init.pp A puppet/modules/trafficserver/templates/build.sh.erb A puppet/modules/trafficserver/templates/cache.config.erb A puppet/modules/trafficserver/templates/cacheurl.config.erb A puppet/modules/trafficserver/templates/header_rewrite.config.erb A puppet/modules/trafficserver/templates/plugin.config.erb A puppet/modules/trafficserver/templates/records.config.erb A puppet/modules/trafficserver/templates/regex_remap.config.erb A puppet/modules/trafficserver/templates/remap.config.erb A puppet/modules/trafficserver/templates/upstart.erb M puppet/modules/varnish/manifests/init.pp D puppet/modules/varnish/templates/systemd/varnish.erb A puppet/modules/varnish/templates/upstart.erb D puppet/modules/wmflib/.rspec M puppet/modules/wmflib/README.md D puppet/modules/wmflib/Rakefile D puppet/modules/wmflib/lib/hiera/backend/httpyaml_backend.rb M puppet/modules/wmflib/lib/hiera/backend/mwyaml_backend.rb M puppet/modules/wmflib/lib/hiera/backend/nuyaml_backend.rb D puppet/modules/wmflib/lib/hiera/backend/proxy_backend.rb D puppet/modules/wmflib/lib/hiera/backend/role_backend.rb D puppet/modules/wmflib/lib/hiera/httpcache.rb M puppet/modules/wmflib/lib/hiera/mwcache.rb D puppet/modules/wmflib/lib/puppet/parser/functions/conflicts.rb D puppet/modules/wmflib/lib/puppet/parser/functions/conftool.rb D puppet/modules/wmflib/lib/puppet/parser/functions/cron_splay.rb D puppet/modules/wmflib/lib/puppet/parser/functions/ensure_mounted.rb D puppet/modules/wmflib/lib/puppet/parser/functions/get_clusters.rb D puppet/modules/wmflib/lib/puppet/parser/functions/hash_deselect_re.rb D puppet/modules/wmflib/lib/puppet/parser/functions/hash_select_re.rb D puppet/modules/wmflib/lib/puppet/parser/functions/htpasswd.rb D puppet/modules/wmflib/lib/puppet/parser/functions/ini.rb D puppet/modules/wmflib/lib/puppet/parser/functions/ipresolve.rb D puppet/modules/wmflib/lib/puppet/parser/functions/os_version.rb D puppet/modules/wmflib/lib/puppet/parser/functions/puppet_ssldir.rb M puppet/modules/wmflib/lib/puppet/parser/functions/require_package.rb D puppet/modules/wmflib/lib/puppet/parser/functions/requires_os.rb D puppet/modules/wmflib/lib/puppet/parser/functions/role.rb D puppet/modules/wmflib/lib/puppet/parser/functions/secret.rb M puppet/modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb D puppet/modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb D puppet/modules/wmflib/spec/fixtures/hiera.proxy.yaml D puppet/modules/wmflib/spec/fixtures/hiera.yaml D puppet/modules/wmflib/spec/fixtures/hieradata/common.yaml D puppet/modules/wmflib/spec/fixtures/hieradata/hosts/foo.yaml D puppet/modules/wmflib/spec/fixtures/hieradata/role/common/test.yaml D puppet/modules/wmflib/spec/fixtures/hieradata/role/common/test2.yaml D puppet/modules/wmflib/spec/functions/conftool_spec.rb D puppet/modules/wmflib/spec/functions/ensure_mounted_spec.rb D puppet/modules/wmflib/spec/functions/hash_deselect_re_spec.rb D puppet/modules/wmflib/spec/functions/hash_select_re_spec.rb D puppet/modules/wmflib/spec/functions/ipresolve_spec.rb D puppet/modules/wmflib/spec/functions/role_spec.rb D puppet/modules/wmflib/spec/hiera/proxy_backend_spec.rb D puppet/modules/wmflib/spec/hiera/role_backend_spec.rb D puppet/modules/wmflib/spec/spec_helper.rb M puppet/modules/xvfb/manifests/init.pp D puppet/modules/xvfb/templates/systemd/xvfb.erb A puppet/modules/xvfb/templates/xvfb.conf.erb A puppet/modules/zotero/manifests/init.pp A puppet/modules/zotero/templates/defaults.js.erb A puppet/modules/zotero/templates/upstart.conf.erb D support/puppet-bootstrap.sh 183 files changed, 1,616 insertions(+), 4,112 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/393788 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idaa4775223c09f7eb001e64634d2a3231024bb1d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: trusty-compat Gerrit-Owner: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
