Diffusion puppet-puppet-cassandra e9924f8e1da1

Merge pull request #405 from dallinb/issue-404
e9924f8e1da1Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.
Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge pull request #405 from dallinb/issue-404

Fix merge conflicts for PR #404

Details

Provenance

Will Yardley <wyardley@users.noreply.github.com>	Authored on Oct 26 2017, 8:23 PM
GitHub <noreply@github.com>	Committed on Oct 26 2017, 8:23 PM
olasd	Pushed on Dec 20 2019, 2:38 PM

Parents

R208:c3eda9d93bd1: Fixed some items that had been broken in the long term.
R208:40f804565c20: Release 2.6.0 (#402)

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

c3eda9d93bd1 Fixed some items that had been broken in the long term.
Author
Ben Dalling <b.dalling@locp.co.uk>
Browse Repository
No Builds
No Audits
5bca7e4d4f12 Fixed a problem in .fixtures.yml. Will probably need to look at dependencies…
Author
Ben Dalling <b.dalling@locp.co.uk>
Browse Repository
No Builds
No Audits
c29ef708cc60 Tests are in fact still failing. Removed the remainder of the stubbed…
Author
Ben Dalling <b.dalling@locp.co.uk>
Browse Repository
No Builds
No Audits
36ebeb944ad0 Utilize .fixtures.yml and removed stubs. Tests now passing (#404).
Author
Ben Dalling <b.dalling@locp.co.uk>
Browse Repository
No Builds
No Audits
307b66a72928 Fixed the spec tests for the custom facts. Still more tests to fix for #404.
Author
Ben Dalling <b.dalling@locp.co.uk>
Browse Repository
No Builds
No Audits
da6625dd25d7 Removed deprecated rake tasks (replaced by msync). Part of work on #404 and…
Author
Ben Dalling <ben.dalling.ext@bbc.co.uk>
Browse Repository
No Builds
No Audits
d82fdd9a78ad RuboCop appeasement (#404).
Author
Ben Dalling <ben.dalling.ext@bbc.co.uk>
Browse Repository
No Builds
No Audits
69659fbbfc38 Ran 'bundle exec rake rubocop:auto_correct'. Summary was '47 files inspected…
Author
Ben Dalling <ben.dalling.ext@bbc.co.uk>
Browse Repository
No Builds
No Audits
af2e0514f159 Fixed issues identified by a later version of Puppet lint (#394).
Author
Ben Dalling <b.dalling@locp.co.uk>
Browse Repository
No Builds
No Audits
5616791d993d Merge remote-tracking branch 'origin/master' into issue-404
Author
Ben Dalling <b.dalling@locp.co.uk>
Browse Repository
No Builds
No Audits
41278b35669d modulesync 1.1.0
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
2454099687f5 add secret
Author
Tim Meusel <tim@bastelfreak.de>
Browse Repository
No Builds
No Audits
0729e03865e4 Release 2.6.0 (#403)
Author
Ben Dalling <dallinb@users.noreply.github.com>
Browse Repository
No Builds
No Audits
85e507bdf040 Implement apache_repo for RedHat (#400)
Author
Ben Dalling <dallinb@users.noreply.github.com>
Browse Repository
No Builds
No Audits
4c7ecc372a56 Cassandra 3.X and Debian 7 clash over GLIBC version. (#399)
Author
Ben Dalling <dallinb@users.noreply.github.com>
Browse Repository
No Builds
No Audits
618393be77f6 #395 Adding Red Hat OS (#396)
Author
Stijn Vanden Brande <stijnvdb@users.noreply.github.com>
Browse Repository
No Builds
No Audits
5bbf9cc0769f Bugfix-397: Spec tests not working. (#398)
Author
Ben Dalling <dallinb@users.noreply.github.com>
Browse Repository
No Builds
No Audits
dac6d921d691 Release 2.5.0
Author
Ben Dalling <dallinb@users.noreply.github.com>
Browse Repository
No Builds
No Audits
b7d23216bdf8 Integration with github_changelog_generator
Author
Ben Dalling <dallinb@users.noreply.github.com>
Browse Repository
No Builds
No Audits

Changes (91)

Path

Size

PULL_REQUEST_TEMPLATE.md

examples/

lib/

facter/

manifests/

spec/

acceptance/

nodesets/

amazonlinux-2016091.yml

windows-2016-base-x64.yml

fedora-24-x64.yml

fedora-25-x64.yml

ubuntu-server-1204-x64.yml

ubuntu-server-1404-x64.yml

ubuntu-server-1604-x64.yml

classes/

apache_repo_spec.rb

coverage_spec.rb

datastax_agent_spec.rb

datastax_repo_spec.rb

dse_spec.rb

firewall_ports_spec.rb

system/

transparent_hugepage_spec.rb

default_facts.yml

defines/

file_spec.rb

private/

firewall_ports/

schema/

unit/

facter/

cassandracmsheapnewsize_spec.rb

cassandracmsmaxheapsize_spec.rb

cassandraheapnewsize_spec.rb

cassandramajorversion_spec.rb

cassandramaxheapsize_spec.rb

cassandraminorversion_spec.rb

cassandrapatchversion_spec.rb

cassandrarelease_spec.rb

R208:e9924f8e1da1

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

Gemfile

View Options

Rakefile

View Options

Vagrantfile

View Options

examples/system_settings.pp

View Options

lib/facter/cassandrarelease.rb

View Options

manifests/datastax_agent.pp

View Options

manifests/init.pp

View Options

manifests/optutils.pp

View Options

rake

View Options

rake/rake_tasks.rb

View Options

rake/tasks

View Options

rake/tasks/deploy

View Options

rake/tasks/deploy.rb

View Options

rake/tasks/deploy/forge.rb

View Options

rake/tasks/deploy/tag.rb

View Options

spec/acceptance/cassandra_spec.rb

View Options

spec/acceptance/nodesets/archlinux-2-x64.yml

View Options

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

View Options

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

View Options

spec/acceptance/nodesets/centos-66-x64-pe.yml

View Options

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

View Options

spec/acceptance/nodesets/debian-78-x64.yml

View Options

spec/acceptance/nodesets/debian-82-x64.yml

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

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

View Options

spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml

View Options

spec/acceptance/nodesets/ec2/image_templates.yaml

View Options

spec/acceptance/nodesets/ec2/rhel-73-x64.yml

View Options

spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml

View Options

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

View Options

spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml

View Options

spec/acceptance/nodesets/fedora-24-x64.yml

View Options

spec/acceptance/nodesets/fedora-25-x64.yml

View Options

spec/acceptance/nodesets/ubuntu-server-1204-x64.yml

View Options

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

View Options

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

View Options

spec/classes/apache_repo_spec.rb

View Options

spec/classes/coverage_spec.rb

View Options

spec/classes/datastax_agent_spec.rb

View Options

spec/classes/datastax_repo_spec.rb

View Options

spec/classes/dse_spec.rb

View Options

spec/classes/firewall_ports_spec.rb

View Options

spec/classes/init_spec.rb

View Options

spec/classes/java_spec.rb

View Options

spec/classes/optutils_spec.rb

View Options

spec/classes/params_spec.rb

View Options

spec/classes/schema_spec.rb

View Options

spec/classes/system/swapoff_spec.rb

View Options

spec/classes/system/sysctl_spec.rb

View Options

spec/classes/system/transparent_hugepage_spec.rb

View Options

spec/default_facts.yml

View Options

spec/defines/file_spec.rb

View Options

spec/defines/private/firewall_ports/rule_spec.rb

View Options

spec/defines/schema/cql_type_spec.rb

View Options

spec/defines/schema/index_spec.rb

View Options

spec/defines/schema/keyspace_spec.rb

View Options

spec/defines/schema/permission_spec.rb

View Options

spec/defines/schema/table_spec.rb

View Options

spec/defines/schema/user_spec.rb

View Options

spec/spec_helper.rb

View Options

spec/unit/facter/cassandracmsheapnewsize_spec.rb

View Options

spec/unit/facter/cassandracmsmaxheapsize_spec.rb

View Options

spec/unit/facter/cassandraheapnewsize_spec.rb

View Options

spec/unit/facter/cassandramajorversion_spec.rb

View Options

spec/unit/facter/cassandramaxheapsize_spec.rb

View Options

spec/unit/facter/cassandraminorversion_spec.rb

View Options

spec/unit/facter/cassandrapatchversion_spec.rb

View Options

spec/unit/facter/cassandrarelease_spec.rb

Merge pull request #405 from dallinb/issue-404e9924f8e1da1UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (91)

R208:e9924f8e1da1

.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

Gemfile

Rakefile

Vagrantfile

examples/system_settings.pp

lib/facter/cassandrarelease.rb

manifests/datastax_agent.pp

manifests/init.pp

manifests/optutils.pp

rake

rake/rake_tasks.rb

rake/tasks

rake/tasks/deploy

rake/tasks/deploy.rb

rake/tasks/deploy/forge.rb

rake/tasks/deploy/tag.rb

spec/acceptance/cassandra_spec.rb

spec/acceptance/nodesets/archlinux-2-x64.yml

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

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

spec/acceptance/nodesets/centos-66-x64-pe.yml

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

spec/acceptance/nodesets/debian-78-x64.yml

spec/acceptance/nodesets/debian-82-x64.yml

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

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

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

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

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

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

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

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

spec/acceptance/nodesets/ec2/amazonlinux-2016091.yml

spec/acceptance/nodesets/ec2/image_templates.yaml

spec/acceptance/nodesets/ec2/rhel-73-x64.yml

spec/acceptance/nodesets/ec2/sles-12sp2-x64.yml

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

spec/acceptance/nodesets/ec2/windows-2016-base-x64.yml

spec/acceptance/nodesets/fedora-24-x64.yml

spec/acceptance/nodesets/fedora-25-x64.yml

spec/acceptance/nodesets/ubuntu-server-1204-x64.yml

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

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

spec/classes/apache_repo_spec.rb

spec/classes/coverage_spec.rb

spec/classes/datastax_agent_spec.rb

spec/classes/datastax_repo_spec.rb

spec/classes/dse_spec.rb

spec/classes/firewall_ports_spec.rb

spec/classes/init_spec.rb

spec/classes/java_spec.rb

spec/classes/optutils_spec.rb

spec/classes/params_spec.rb

spec/classes/schema_spec.rb

spec/classes/system/swapoff_spec.rb

spec/classes/system/sysctl_spec.rb

spec/classes/system/transparent_hugepage_spec.rb

spec/default_facts.yml

spec/defines/file_spec.rb

Merge pull request #405 from dallinb/issue-404
e9924f8e1da1Unpublished
Actions