Diffusion puppet-puppet-redis cc5c78ae7bee

Merge remote-tracking branch 'voxpupuli/master' + resolve conflicts
cc5c78ae7bee
Actions

Description

Merge remote-tracking branch 'voxpupuli/master' + resolve conflicts

Details

Provenance

Evgeny Liskovets <eugene.liskovets@gmail.com>	Authored on Aug 3 2020, 9:44 AM
vsellier	Pushed on Sep 24 2020, 2:50 PM

Parents

R226:00c025f2d8d9: Make protected-mode configurable for sentinel
R226:101cb499ed48: Merge pull request #357 from mmoll/ubu20

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

101cb499ed48 Merge pull request #357 from mmoll/ubu20
Author
Dennis Hoppe <github@debian-solutions.de>
Browse Repository
No Builds
No Audits
0cac1d44ec16 Add Ubuntu 20.04 support
Author
Michael Moll <kvedulv@kvedulv.de>
Browse Repository
No Builds
No Audits
9246998db551 [blacksmith] Bump version to 6.0.1-rc0
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
6e392e0a6c52 Release 6.0.0
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
c15870f7e232 Merge pull request #358 from ekohl/soft-deps
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
1f8a8e16dfc3 Make apt and epel soft dependencies
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
deaab21f6a24 Merge pull request #355 from alexskr/systemd-fix
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
111f4b601d02 update spec tests
Author
Alex Skrenchuk <alexskr@stanford.edu>
Browse Repository
No Builds
No Audits
ed72244b4721 change systemd stop command to redis-cli
Author
Alex Skrenchuk <alexskr@stanford.edu>
Browse Repository
No Builds
No Audits
32710e8a6e74 Merge pull request #351 from voxpupuli/modulesync
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
6530f2c9723f modulesync 2.12.0
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
05b828b93132 Remove redis_service_* helpers
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
f3c343087845 Merge pull request #352 from dhoppe/fix_dependency
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
8823cec5784b Require puppet-epel over stahnma-epel
Author
Dennis Hoppe <github@debian-solutions.de>
Browse Repository
No Builds
No Audits
8e48eeea4496 Merge pull request #350 from yakatz/master
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
af7bcb1088ae Add tests for RedHat/CentOS 8
Author
Yehuda Katz <ykatz@cs.umd.edu>
Browse Repository
No Builds
No Audits
ef7c4e60f34a Merge pull request #343 from fraenki/multi_instance
Author
Garrett Honeycutt <code@garretthoneycutt.com>
Browse Repository
No Builds
No Audits
d779b75a937d add finishing touches to multi-instance support
Author
Frank Wall <fw@moov.de>
Browse Repository
No Builds
No Audits
1cf0599501d2 Merge pull request #348 from ekohl/native-testing
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
6f4fd7959f14 Use more native rspec and serverspec testing
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
c0db4610e172 Merge pull request #344 from ekohl/debian10
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
e2fed7a4b144 Add Debian 10 support
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
de305041745f Merge pull request #346 from ekohl/manage-repo
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
933488f040f6 Run acceptance tests with manage_repo => false
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
e69b20da96d6 Merge pull request #347 from ekohl/fix-sentinel-pid
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
b6997e08d991 Fix the sentinel pid file location for Ubuntu 18.04
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
5e66e264101c Merge pull request #345 from ekohl/refactor-bolt-testing
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
26e7e5c2fc19 Update bolt testing to use modern versions
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
6db13977beb8 Merge pull request #342 from basti-nis/master
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
edbfa09c5dcf Update redis.service.erb
Author
basti-nis <s.treu@neusta.de>
Browse Repository
No Builds
No Audits
354b8df648a1 Merge pull request #340 from voxpupuli/modulesync
Author
Garrett Honeycutt <code@garretthoneycutt.com>
Browse Repository
No Builds
No Audits
8749ce7e52ae fix socket directory for redis service
Author
basti-nis <s.treu@neusta.de>
Browse Repository
No Builds
No Audits
46cc3c312148 modulesync 2.10.0
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
d59c880040cf Merge pull request #339 from voxpupuli/modulesync
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
1fa7e3b39361 Fix Travis CI pipeline
Author
Dennis Hoppe <github@debian-solutions.de>
Browse Repository
No Builds
No Audits
cae972e6be53 Use Ruby 2.1 for RuboCop
Author
Dennis Hoppe <github@debian-solutions.de>
Browse Repository
No Builds
No Audits
6e8b5f70f085 modulesync 2.9.0
Author
Dennis Hoppe <github@debian-solutions.de>
Browse Repository
No Builds
No Audits
b7f8df03c34b [blacksmith] Bump version to 5.0.1-rc0
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
35a01c68144f Release 5.0.0
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
b6d8daadda80 Drop contributing instructions from README
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
d9eb0197b21a Use GHCG from Voxpupuli
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
1b1398168eb7 Merge pull request #334 from ekohl/scl
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
cd09fc85249a Add SCL support
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
80f0e3673aea Merge pull request #333 from ekohl/empty-unixsocket
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
f415fe8a3ee9 Merge pull request #336 from ekohl/os-defaults
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
fce8da9c7b97 Closer match parameter to OS defaults
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
009da3433d08 Remove unused variables
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
abe52f282c86 Simplify code to pass in the service name
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
f8887aa043e0 Update parameters ordering
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits
f93b1f2f9961 Simplify sentinel's config template
Author
Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Browse Repository
No Builds
No Audits

Changes (95)

Path

Size

PULL_REQUEST_TEMPLATE.md

lib/

facter/

redis_server_version.rb

puppet/

manifests/

spec/

acceptance/

multi-node-master-slave.yml

ubuntu-1404-docker.yml

ubuntu-1404-x64.yml

ubuntu-1604-docker.yml

ubuntu-1604-x64.yml

redis_cli_task_spec.rb

suites/

default/

redis_adminstration_spec.rb

redis_debian_run_dir_spec.rb

redis_multi_instances_one_host_spec.rb

redis_multi_node_spec.rb

redis_sentinel_one_node_spec.rb

classes/

redis_administration_spec.rb

redis_centos_6_spec.rb

redis_debian_wheezy_spec.rb

redis_freebsd_spec.rb

redis_sentinel_spec.rb

redis_spec.rb

redis_ubuntu_1404_spec.rb

defines/

redis_server_2410_version

redis_server_2819_version

redis_server_3209_version

functions/

redis

	redis/

	get_spec.rb
	redisget_spec.rb

redisget_spec.rb

spec_helper.rb

spec_helper_acceptance.rb

unit/

redis_server_version_spec.rb

tasks/

redis_cli.rb

templates/

redis-sentinel.conf.erb

redis.conf.2.4.10.erb

service_templates/

R226:cc5c78ae7bee

View Options

.editorconfig

View Options

.fixtures.yml

View Options

.github/CONTRIBUTING.md

View Options

.github/ISSUE_TEMPLATE.md

View Options

.github/PULL_REQUEST_TEMPLATE.md

View Options

.gitignore

View Options

.msync.yml

View Options

.overcommit.yml

View Options

.pmtignore

View Options

.rspec

View Options

.rspec_parallel

View Options

.rubocop.yml

View Options

.sync.yml

View Options

.travis.yml

View Options

.yardopts

View Options

CHANGELOG.md

View Options

Dockerfile

View Options

Gemfile

View Options

LICENSE

View Options

README.md

View Options

REFERENCE.md

View Options

Rakefile

View Options

lib/facter/redis_server_version.rb

View Options

lib/puppet/functions/redis/get.rb

View Options

lib/puppet/parser

View Options

lib/puppet/parser/functions

View Options

lib/puppet/parser/functions/redisget.rb

View Options

manifests/administration.pp

View Options

manifests/config.pp

View Options

manifests/globals.pp

View Options

manifests/init.pp

View Options

manifests/install.pp

View Options

manifests/instance.pp

View Options

manifests/params.pp

View Options

manifests/preinstall.pp

View Options

manifests/sentinel.pp

View Options

manifests/service.pp

View Options

manifests/ulimit.pp

View Options

metadata.json

View Options

spec/acceptance/nodesets

View Options

spec/acceptance/nodesets/centos-6-docker.yml

View Options

spec/acceptance/nodesets/centos-6-x64.yml

View Options

spec/acceptance/nodesets/centos-7-docker.yml

View Options

spec/acceptance/nodesets/centos-7-x64.yml

View Options

spec/acceptance/nodesets/debian-7-docker.yml

View Options

spec/acceptance/nodesets/debian-8-docker.yml

View Options

spec/acceptance/nodesets/default.yml

View Options

spec/acceptance/nodesets/multi-node-master-slave.yml

View Options

spec/acceptance/nodesets/ubuntu-1404-docker.yml

View Options

spec/acceptance/nodesets/ubuntu-1404-x64.yml

View Options

spec/acceptance/nodesets/ubuntu-1604-docker.yml

View Options

spec/acceptance/nodesets/ubuntu-1604-x64.yml

View Options

spec/acceptance/redis_cli_task_spec.rb

View Options

spec/acceptance/suites/default/redis_adminstration_spec.rb

View Options

spec/acceptance/suites/default/redis_debian_run_dir_spec.rb

View Options

spec/acceptance/suites/default/redis_multi_instances_one_host_spec.rb

View Options

spec/acceptance/suites/default/redis_multi_node_spec.rb

View Options

spec/acceptance/suites/default/redis_sentinel_one_node_spec.rb

View Options

spec/acceptance/suites/default/redis_spec.rb

View Options

spec/acceptance/suites/default/redisget_spec.rb

View Options

spec/acceptance/suites/scl/redis5_spec.rb

View Options

spec/classes/redis_administration_spec.rb

View Options

spec/classes/redis_centos_6_spec.rb

View Options

spec/classes/redis_debian_wheezy_spec.rb

View Options

spec/classes/redis_freebsd_spec.rb

View Options

spec/classes/redis_sentinel_spec.rb

View Options

spec/classes/redis_spec.rb

View Options

spec/classes/redis_ubuntu_1404_spec.rb

View Options

spec/classes/redis_ulimit_spec.rb

View Options

spec/defines/instance_spec.rb

View Options

spec/fixtures

View Options

spec/fixtures/facts

View Options

spec/fixtures/facts/redis_server_2410_version

View Options

spec/fixtures/facts/redis_server_2819_version

View Options

spec/fixtures/facts/redis_server_3209_version

View Options

spec/functions/redis/get_spec.rb

View Options

spec/functions/redisget_spec.rb

View Options

spec/spec_helper.rb

View Options

spec/spec_helper_acceptance.rb

View Options

spec/unit/redis_server_version_spec.rb

View Options

tasks/redis_cli.rb

View Options

templates/redis-sentinel.conf.erb

View Options

templates/redis.conf.2.4.10.erb

View Options

templates/redis.conf.2.8.erb

View Options

templates/redis.conf.3.2.erb

View Options

templates/redis.conf.erb

View Options

templates/service_templates/redis.service.erb

View Options

types/loglevel.pp

View Options

Merge remote-tracking branch 'voxpupuli/master' + resolve conflictscc5c78ae7beeActions

Description

Details

Event Timeline

Merged Changes

Changes (95)

R226:cc5c78ae7bee

.editorconfig

.fixtures.yml

.github/CONTRIBUTING.md

.github/ISSUE_TEMPLATE.md

.github/PULL_REQUEST_TEMPLATE.md

.gitignore

.msync.yml

.overcommit.yml

.pmtignore

.rspec

.rspec_parallel

.rubocop.yml

.sync.yml

.travis.yml

.yardopts

CHANGELOG.md

Dockerfile

Gemfile

LICENSE

README.md

REFERENCE.md

Rakefile

lib/facter/redis_server_version.rb

lib/puppet/functions/redis/get.rb

lib/puppet/parser

lib/puppet/parser/functions

lib/puppet/parser/functions/redisget.rb

manifests/administration.pp

manifests/config.pp

manifests/globals.pp

manifests/init.pp

manifests/install.pp

manifests/instance.pp

manifests/params.pp

manifests/preinstall.pp

manifests/sentinel.pp

manifests/service.pp

manifests/ulimit.pp

metadata.json

spec/acceptance/nodesets

spec/acceptance/nodesets/centos-6-docker.yml

spec/acceptance/nodesets/centos-6-x64.yml

spec/acceptance/nodesets/centos-7-docker.yml

spec/acceptance/nodesets/centos-7-x64.yml

spec/acceptance/nodesets/debian-7-docker.yml

spec/acceptance/nodesets/debian-8-docker.yml

spec/acceptance/nodesets/default.yml

spec/acceptance/nodesets/multi-node-master-slave.yml

spec/acceptance/nodesets/ubuntu-1404-docker.yml

spec/acceptance/nodesets/ubuntu-1404-x64.yml

spec/acceptance/nodesets/ubuntu-1604-docker.yml

spec/acceptance/nodesets/ubuntu-1604-x64.yml

spec/acceptance/redis_cli_task_spec.rb

spec/acceptance/suites/default/redis_adminstration_spec.rb

spec/acceptance/suites/default/redis_debian_run_dir_spec.rb

spec/acceptance/suites/default/redis_multi_instances_one_host_spec.rb

spec/acceptance/suites/default/redis_multi_node_spec.rb

spec/acceptance/suites/default/redis_sentinel_one_node_spec.rb

spec/acceptance/suites/default/redis_spec.rb

spec/acceptance/suites/default/redisget_spec.rb

spec/acceptance/suites/scl/redis5_spec.rb

spec/classes/redis_administration_spec.rb

spec/classes/redis_centos_6_spec.rb

spec/classes/redis_debian_wheezy_spec.rb

spec/classes/redis_freebsd_spec.rb

spec/classes/redis_sentinel_spec.rb

spec/classes/redis_spec.rb

spec/classes/redis_ubuntu_1404_spec.rb

spec/classes/redis_ulimit_spec.rb

spec/defines/instance_spec.rb

spec/fixtures

spec/fixtures/facts

spec/fixtures/facts/redis_server_2410_version

Merge remote-tracking branch 'voxpupuli/master' + resolve conflicts
cc5c78ae7bee
Actions