Skip to content
Snippets Groups Projects
Verified Commit b1a6fd24 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'dev' into f-one-time-token

parents 01f966b0 1f697740
No related branches found
No related tags found
No related merge requests found
Insert a meaningful description for this merge request here. What is the
new/changed behavior? Which bug was fixed?
---
Add the text above this line to the git comment.
# Check list for the author #
- [ ] All tests pass. (style, unit/integration, static code analysis)
- [ ] What is the main focus for the reviewer? What is the core intent of this
MR?
- [ ] How to set up a test environment.
- [ ] Annotations in code (Gitlab comments)
- Intent of new code
- Problems with old code
- Why this implementation?
# Check list for the reviewer #
- [ ] Tests pass
- [ ] Do I understand the intent of this MR?
- [ ] Does the test environment setup work?
- [ ] Is the intended behavior reproducible in the test environment?
- [ ] Code overview: Which functions/classes are relevant for understanding the MR?
- [ ] Work through the open comment threads.
- [ ] Are the doc strings / comments up-to-date? Or have there been behavioral
changes without amending the documentation?
- [ ] Are there spezifications? Are they satisfied?
......@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ###
- Replaced deprecated Logger.warn() method.
### Security ###
## [0.3.0] - 2020-04-24##
......
......@@ -47,9 +47,9 @@ from setuptools import find_packages, setup
MAJOR = 0
MINOR = 3
MICRO = 1
MICRO = 2
PRE = "" # e.g. rc0, alpha.1, 0.beta-23
ISRELEASED = True
ISRELEASED = False
if PRE:
VERSION = "{}.{}.{}-{}".format(MAJOR, MINOR, MICRO, PRE)
......
......@@ -178,10 +178,10 @@ class _DefaultCaosDBServerConnection(CaosDBServerConnection):
context.verify_mode = ssl.CERT_REQUIRED
if config.get("ssl_insecure"):
_LOGGER.warn("*** Warning! ***\n"
"Insecure SSL mode, certificate will not be checked! "
"Please consider removing the `ssl_insecure` configuration option.\n"
"****************")
_LOGGER.warning("*** Warning! ***\n"
"Insecure SSL mode, certificate will not be checked! "
"Please consider removing the `ssl_insecure` configuration option.\n"
"****************")
context.verify_mode = ssl.CERT_NONE
if (not context.verify_mode == ssl.CERT_NONE and
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment