Skip to content

Commit

Permalink
Merge pull request #909 from eemperor/0.16.1
Browse files Browse the repository at this point in the history
Releases watchmaker version 0.16.1
  • Loading branch information
eemperor authored Jun 21, 2019
2 parents c561b17 + d30459c commit 666ad1a
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.16.0
current_version = 0.16.1
commit = False
tag = False
tag_name = {new_version}
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
## Changelog

### 0.16.1

**Commit Delta**: [Change from 0.16.0 release](https://github.com/plus3it/watchmaker/compare/0.16.0...0.16.1)

**Released**: 2019.06.21

**Summary**:

* join-domain-formula
- Updates find-collision.sh ldap search to include uppercase and lowercase versions of provided hostname
* scap-formula
- Adds script to build OSCAP content with 'stig' profile included for CentOS
- Updates OSCAP content to v0.1.44
* watchmaker-salt-content
- Switches Linux scap profile pillar settings to 'stig'

### 0.16.0

**Commit Delta**: [Change from 0.15.2 release](https://github.com/plus3it/watchmaker/compare/0.15.2...0.16.0)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
[![Travis CI Build Status](https://travis-ci.org/plus3it/watchmaker.svg?branch=develop)](https://travis-ci.org/plus3it/watchmaker)
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/plus3it/watchmaker?branch=develop&svg=true)](https://ci.appveyor.com/project/plus3it/watchmaker)
[![Latest Version](https://img.shields.io/pypi/v/watchmaker.svg?label=version)](https://pypi.python.org/pypi/watchmaker)
[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)

# Watchmaker

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

autoclass_content = 'class'
autodoc_member_order = 'bysource'
autodoc_default_flags = ['members', 'show-inheritance']
autodoc_default_options = {'members': True, 'show-inheritance': True}

napoleon_use_param = False

Expand Down
2 changes: 1 addition & 1 deletion docs/findings/el7.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Some scanners implement an "intentional fail" for this audit-item. This is desig

This automation has the underlying assumption that all RPM-managed SUID files — be it by the OS vendor or the provider of the software _hosted by_ the OS — is implicitly authorized. A way to quickly-verify compliance with this assumption is to execute:

~~~
~~~bash
for SUID in $( find / -user root -perm -4000 -print 2> /dev/null )
do
printf "%s: " "${SUID}"
Expand Down
2 changes: 1 addition & 1 deletion docs/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ Variables can be input interactively via the Terraform console or directly to
the Terraform module. An example Terraform file that calls the `lx-autoscale`
module is shown below.

```
```terraform
provider "aws" {}
module "test-lx-instance" {
Expand Down
6 changes: 3 additions & 3 deletions requirements/check.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
check-manifest==0.38
check-manifest==0.39
flake8==3.7.7
flake8-bugbear==19.3.0
flake8-builtins==1.4.1
flake8-docstrings==1.3.0
flake8-isort==2.7.0
flake8-future-import==0.4.5
flake8-print==3.1.0
isort==4.3.18
isort==4.3.20
m2r==0.2.1
pep8-naming==0.8.2
pydocstyle==3.0.0
pygments==2.4.0
pygments==2.4.2
pylint==2.3.1
readme-renderer==24.0
2 changes: 1 addition & 1 deletion requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
m2r==0.2.1
setuptools==41.0.1
sphinx==2.0.1
sphinx==2.1.2
sphinx-rtd-theme==0.4.3
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
mock==2.0.0;python_version=="2.6" # pyup: ==2.0.0
mock==3.0.5;python_version>="2.7"
pytest==3.2.5;python_version=="2.6" or python_version=="3.3" # pyup: ==3.2.5
pytest==4.4.2;python_version=="2.7" or python_version>="3.4"
pytest==4.6.3;python_version=="2.7" or python_version>="3.4"
pytest-travis-fold==1.3.0
pytest-catchlog==1.2.2;python_version=="2.6"
pytest-cov==2.5.1;python_version=="2.6" # pyup: ==2.5.1
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[metadata]
name = watchmaker
description = Applied Configuration Management
version = 0.16.0
version = 0.16.1
author = Plus3IT Maintainers of Watchmaker
author_email = [email protected]
url = https://github.com/plus3it/watchmaker
Expand Down
2 changes: 1 addition & 1 deletion src/watchmaker/static/salt/content

0 comments on commit 666ad1a

Please sign in to comment.