resolve merge conflict in manifests/conf.pp
a79aa4c67261
Actions

Description

resolve merge conflict in manifests/conf.pp

Details

Provenance

Joris Dedieu <joris.dedieu@nfrance.com>	Authored on Nov 7 2018, 3:56 PM
olasd	Pushed on Jun 26 2019, 2:00 PM

Parents

rSPSUDO8e7db3ef7747: [master-] correct aa typo
rSPSUDOf2e2d62c2ad9: Merge pull request #225 from ttres/patch-1

Branches

Unknown

Tags

Unknown

Event Timeline

Joris Dedieu <joris.dedieu@nfrance.com> committed rSPSUDOa79aa4c67261: resolve merge conflict in manifests/conf.pp (authored by Joris Dedieu <joris.dedieu@nfrance.com>).Nov 7 2018, 3:56 PM

Merged Changes

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

f2e2d62c2ad9 Merge pull request #225 from ttres/patch-1
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
568cbc349d8c Update sudoers.rhel7.erb
Author
Taciano Tres <tacianotres@gmail.com>
Browse Repository
No Builds
No Audits
eb86deebc394 Merge pull request #218 from spidersddd/master
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
7b804c6b85ae Merge pull request #217 from gitkodak/master
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
2c50fd61306a Fix for Rubocop test failing.
Author
Troy Klein <troy.klein@puppet.com>
Browse Repository
No Builds
No Audits
59482c836795 anchors rhel 5 regex in params.pp
Author
Jason Balicki <jbalicki@centene.com>
Browse Repository
No Builds
No Audits
a43f750d671b Merge pull request #214 from davidgibbons/master
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
4932ff28ab48 Merge branch 'master' into master
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
b41e416119fd Merge pull request #211 from bitcrush/allow_array_for_purge_ignore
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
2c6ce872a32a change requirement ordering since we may not have a package, and dont anchor…
Author
Gibbons, David <dgibbons@crowdcompass.com>
Browse Repository
No Builds
No Audits
1e3f86a4b14d for a number of OSs we make package optional, so we probably dont want to try…
Author
Gibbons, David <dgibbons@crowdcompass.com>
Browse Repository
No Builds
No Audits
1c9d21b10c11 Let $purge_ignore accept an array of strings
Author
Robert Flechtner <flechtner@chemmedia.de>
Browse Repository
No Builds
No Audits
6cbe87db6687 new release v5.0.0
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
47bd2e211896 do not check for ruby version on deploy
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
3ac4704e7cfa do not delete .keep-me file on FreeBSD, fixes #196
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
e08081abfc94 Merge pull request #185 from fduranti/master
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
650321efd922 Change the way visudo checks are done with 2 options.
Author
fduranti <fduranti@q8.it>
Browse Repository
No Builds
No Audits
3eba6eee328b replace hiera_array with lookup, fixes #200
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
363c2a0ad1ca Merge pull request #201 from aeber/feature_permissions
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
89d18fd29d7f fix package_ldap type
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
8d257513cca1 Revert "Merge pull request #203 from sudodevnull/patch-1"
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
c991bfb5a103 Merge branch 'master' into feature_permissions
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
85c74ccdc29f Merge pull request #209 from Kyoshiro-san/master
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
ef46d1b82dd0 Merge pull request #203 from sudodevnull/patch-1
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
532273a698d7 fix rubocop issues
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
37c4c19f70ec Merge pull request #204 from blackmetal23/master
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
ebd2e7fc774c Fix deprecation notices, use internal variable typing
Author
Loïc Gomez <Kyoshiro-san@users.noreply.github.com>
Browse Repository
No Builds
No Audits
4d222e20bb41 Update sudoers.rhel7.erb
Author
blackmetal23 <blackmetal23@users.noreply.github.com>
Browse Repository
No Builds
No Audits
2d0371545182 replace anchor with contain
Author
Ryan Hall <techryan11@gmail.com>
Browse Repository
No Builds
No Audits
62397dd76586 allow setting the mode of $config_dir and $config_file
Author
Anselm Eberhardt <aeberhardt@dg-i.net>
Browse Repository
No Builds
No Audits
1a2a3927c49e remove puppet3 from travis, as it isn't supported anymore
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
cee99ba090ae replace double quotes with single quotes
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
4540ab2bf2d4 add .pmtignore file
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
ed92c1b8a7d5 Merge pull request #188 from jg-development/master
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
08dbac5ab2cf add supported puppet version information to README
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
8a520071101b new release v4.2.0, fixes #195
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
3bb412abd948 drop ruby 1.9 tests
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
35b2360d0d56 fix rubocop issue
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
5126ef7c3d9f Merge pull request #194 from treydock/conf-array-comment
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
b4218bfa6412 stdlib dependency should be lower than 5.0.0
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
7762ebb79e7f Add comment to beginning of sudo::conf content when content is an array
Author
Trey Dockendorf <tdockendorf@osc.edu>
Browse Repository
No Builds
No Audits
55533795b87c fix more rubocop issues
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
7b0076f1a8ab update supported operatingsystems, fixes #179
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
4fe444922cc3 fix some rubocop issues
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
5c14a19a49d3 add snap path to secure_path, fixes #189
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
feae438b0e9d Merge pull request #181 from tosmi/package
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
6f37a759e0e9 Merge pull request #193 from rnelson0/patch-1
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
f8b4b0d1df07 fix rubocop issue
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits
5677ae9ba25b Document change from `$sudo::source` to `$sudo::content`
Author
Rob Nelson <rnelson0@gmail.com>
Browse Repository
No Builds
No Audits
d41e6dad71e3 fix visudo path, add parameter for visudo path, fixes #187, #178
Author
Steffen Zieger <me@saz.sh>
Browse Repository
No Builds
No Audits

Changes (52)

Path

Size

manifests/

spec/

acceptance/

classes/

defines/

	templates/
	files/

	sudoers.aix.erb
	sudoers.aix

	sudoers.archlinux.erb
	sudoers.archlinux

	sudoers.darwin.erb
	sudoers.darwin

	sudoers.debian.erb
	sudoers.debian

	sudoers.freebsd.erb
	sudoers.freebsd

	sudoers.gentoo.erb
	sudoers.gentoo

	sudoers.olddebian.erb
	sudoers.olddebian

	sudoers.omnios.erb
	sudoers.omnios

	sudoers.openbsd.erb
	sudoers.openbsd

	sudoers.rhel5.erb
	sudoers.rhel5

	sudoers.rhel6.erb
	sudoers.rhel6

	sudoers.rhel7.erb
	sudoers.rhel7

	sudoers.smartos.erb
	sudoers.smartos

	sudoers.solaris.erb
	sudoers.solaris

	sudoers.suse.erb
	sudoers.suse

	sudoers.ubuntu.erb
	sudoers.ubuntu

templates/

sudoers.erb

rSPSUDOa79aa4c67261

View Options

.bundle

View Options

.bundle/config

View Options

.gitignore

View Options

.pmtignore

View Options

.rubocop.yml

View Options

.travis.yml

View Options

README.md

View Options

files

View Options

files/sudoers.aix

View Options

files/sudoers.archlinux

View Options

files/sudoers.darwin

View Options

files/sudoers.debian

View Options

files/sudoers.freebsd

View Options

files/sudoers.gentoo

View Options

files/sudoers.olddebian

View Options

files/sudoers.omnios

View Options

files/sudoers.openbsd

View Options

files/sudoers.rhel5

View Options

files/sudoers.rhel6

View Options

files/sudoers.rhel7

View Options

files/sudoers.smartos

View Options

files/sudoers.solaris

View Options

files/sudoers.suse

View Options

files/sudoers.ubuntu

View Options

manifests/allow.pp

View Options

manifests/conf.pp

View Options

manifests/configs.pp

View Options

manifests/init.pp

View Options

manifests/params.pp

View Options

metadata.json

View Options

spec/acceptance/class_spec.rb

View Options

spec/acceptance/sudo_conf_spec.rb

View Options

spec/classes/sudo_spec.rb

View Options

spec/defines/sudo_spec.rb

View Options

spec/spec_helper.rb

View Options

templates/sudoers.aix.erb

View Options

templates/sudoers.archlinux.erb

View Options

templates/sudoers.darwin.erb

View Options

templates/sudoers.debian.erb

View Options

templates/sudoers.erb

View Options

templates/sudoers.freebsd.erb

View Options

templates/sudoers.gentoo.erb

View Options

templates/sudoers.olddebian.erb

View Options

templates/sudoers.omnios.erb

View Options

templates/sudoers.openbsd.erb

View Options

templates/sudoers.rhel5.erb

View Options

templates/sudoers.rhel6.erb

View Options

templates/sudoers.rhel7.erb

View Options

templates/sudoers.smartos.erb

View Options

templates/sudoers.solaris.erb

View Options

templates/sudoers.suse.erb

View Options

templates/sudoers.ubuntu.erb

resolve merge conflict in manifests/conf.ppa79aa4c67261Actions

Description

Details

Event Timeline

Merged Changes

Changes (52)

rSPSUDOa79aa4c67261

.bundle

.bundle/config

.gitignore

.pmtignore

.rubocop.yml

.travis.yml

README.md

files

files/sudoers.aix

files/sudoers.archlinux

files/sudoers.darwin

files/sudoers.debian

files/sudoers.freebsd

files/sudoers.gentoo

files/sudoers.olddebian

files/sudoers.omnios

files/sudoers.openbsd

files/sudoers.rhel5

files/sudoers.rhel6

files/sudoers.rhel7

files/sudoers.smartos

files/sudoers.solaris

files/sudoers.suse

files/sudoers.ubuntu

manifests/allow.pp

manifests/conf.pp

manifests/configs.pp

manifests/init.pp

manifests/params.pp

metadata.json

spec/acceptance/class_spec.rb

spec/acceptance/sudo_conf_spec.rb

spec/classes/sudo_spec.rb

spec/defines/sudo_spec.rb

spec/spec_helper.rb

templates/sudoers.aix.erb

templates/sudoers.archlinux.erb

templates/sudoers.darwin.erb

templates/sudoers.debian.erb

templates/sudoers.erb

templates/sudoers.freebsd.erb

templates/sudoers.gentoo.erb

templates/sudoers.olddebian.erb

templates/sudoers.omnios.erb

templates/sudoers.openbsd.erb

templates/sudoers.rhel5.erb

templates/sudoers.rhel6.erb

templates/sudoers.rhel7.erb

templates/sudoers.smartos.erb

templates/sudoers.solaris.erb

templates/sudoers.suse.erb

templates/sudoers.ubuntu.erb

resolve merge conflict in manifests/conf.pp
a79aa4c67261
Actions