Skip to content

Commit

Permalink
Merge 6db6281 into ce7b9ba
Browse files Browse the repository at this point in the history
  • Loading branch information
andy-maier committed Jan 7, 2019
2 parents ce7b9ba + 6db6281 commit 30298ef
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -171,7 +171,7 @@ plugin_formatter_template_dir := $(shell dirname $(plugin_formatter_template_fil
# validate-modules tool from Ansible project
validate_modules := $(ansible_repo_dir)/test/sanity/validate-modules/validate-modules
validate_modules_log_file := validate.log
validate_modules_exclude_pattern := (E101|E105|E106)
validate_modules_exclude_pattern := (E101|E105|E106|DeprecationWarning)

# Documentation files from Ansible repo to copy to $(doc_gen_dir)
doc_copy_files := \
Expand Down Expand Up @@ -261,7 +261,7 @@ uninstall:
.PHONY: clobber
clobber:
rm -Rf .cache $(package_name_pypi_under).egg-info .eggs $(build_dir) $(doc_check_dir) htmlcov .tox
rm -f MANIFEST MANIFEST.in AUTHORS ChangeLog .coverage flake8_*.log test_*.log validate.log
rm -f MANIFEST MANIFEST.in AUTHORS ChangeLog .coverage flake8_*.log test_*.log $(validate_modules_log_file)
find . -name "*.pyc" -delete -o -name "__pycache__" -delete -o -name "*.tmp" -delete -o -name "tmp_*" -delete
@echo 'Done: Removed all build products to get to a fresh state.'
@echo '$@ done.'
Expand Down
13 changes: 7 additions & 6 deletions docs/changes.rst
Expand Up @@ -22,15 +22,11 @@ Change log
Version 0.6.0
^^^^^^^^^^^^^

Released: not yet

**Incompatible changes:**

**Deprecations:**
Released: 2018-01-07

**Bug fixes:**

* Fixed dependency to zhmcclient package to be >=0.20.0, instead
* Fixed dependency to zhmcclient package to be >=0.22.0, instead
of using its master branch from the github repo.

* Updated the 'requests' package to 2.20.0 to fix the following vulnerability:
Expand All @@ -42,6 +38,11 @@ Released: not yet
input parameter, and not for the `match` input parameter. The type conversions
are now applied for all properties of Adapter also for the `match` parameter.

* The dictionary to check input properties for the `zhmc_cpc` module had the
`acceptable_status` property written with a hyphen instead of underscore.
This had the effect that it was rejected as non-writeable when specifying
it as input.

**Enhancements:**

* Docs: Improved and fixed the documentation how to release a version
Expand Down
2 changes: 1 addition & 1 deletion zhmc_ansible_modules/zhmc_cpc.py
Expand Up @@ -200,7 +200,7 @@

# update properties:
'description': (True, None, True, True, None, to_unicode),
'acceptable-status': (True, None, True, True, None, None),
'acceptable_status': (True, None, True, True, None, None),

# read-only properties (subset):
'name': (False, None, False, None, None, None), # provided in 'name' parm
Expand Down

0 comments on commit 30298ef

Please sign in to comment.