Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

redis update #255

Merged
merged 20 commits into from
Jul 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a120c3a
Merge pull request #1 from LLNL/develop
koning Dec 4, 2019
d76d67f
Merge remote-tracking branch 'upstream/develop' into develop
koning Mar 6, 2020
c18866b
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 9, 2020
3a7d035
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 9, 2020
43c8e49
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 11, 2020
3bb9184
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 12, 2020
9776a3e
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 13, 2020
461aad3
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 18, 2020
0bad54c
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 23, 2020
3b8b4a4
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 25, 2020
7ee915b
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 25, 2020
3de4524
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 30, 2020
b3b3d81
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Mar 31, 2020
58bedd7
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Apr 2, 2020
40865c1
Merge branch 'develop' of github.com:koning/merlin into develop
koning Apr 27, 2020
273b02d
Merge branch 'develop' of github.com:llnl/merlin into develop
koning Apr 27, 2020
a3e21ca
Merge branch 'develop' of github.com:llnl/merlin into develop
koning May 11, 2020
f9f7eb5
Merge remote-tracking branch 'upstream/develop' into develop
koning Jul 20, 2020
86a1045
Update redis to new version with TLS support.
koning Jul 20, 2020
c910c1c
Add changelog.
koning Jul 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Flux test example data collection for new versions of flux.
- Fixed Docker ubuntu version.

### Fixed
- Removed expansion of env variables in shell sections (`cmd` and `restart`) of provenance
specs. This allows the shell command itself to expand environment variables, and gives
users greater flexibility.
- Allowed environment variables to be properly expanded in study `description.name`.
- Tilde (~) now properly expands as part of a path in non-shell sections.

### Changed
- Updated tutorial redis version to 6.0.5.

## [1.6.2]

### Added
Expand Down
6 changes: 3 additions & 3 deletions docs/source/modules/installation/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ can also be used for the celery broker. This method will be called local-redis.
.. code-block:: bash

# Download redis
wget http://download.redis.io/releases/redis-5.0.7.tar.gz
wget http://download.redis.io/releases/redis-6.0.5.tar.gz

# Untar
tar xvf redis*.tar.gz
Expand Down Expand Up @@ -361,8 +361,8 @@ server and python.
mkdir -p ${HOME}/merlinu/cert_redis
cp result/* ${HOME}/merlinu/cert_redis

The ``redis:6.0-rc2`` docker service is exchanged for the previous
``redis:latest`` service. The configuration below does not use client

The configuration below does not use client
verification ``--tls-auth-clients no`` so the ssl files do not need to
be defined as shown in the :ref:`broker_redis_ssl` section.

Expand Down