Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Commit

Permalink
Merge branch '0.5.1-prerelease' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
nhammond committed Aug 24, 2017
2 parents de99a42 + c13324e commit c988276
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
# built documents.
#
# The short X.Y version.
version = u'0.5.0'
version = u'0.5.1'
# The full version, including alpha/beta/rc tags.
release = u'0.5.0'
release = u'0.5.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 4 additions & 0 deletions doc/releasenotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
Release Notes
#############

0.5.1
=============
* Enhanced validation of templates and data objects

0.5.0
=============
* Tags and labels for files, templates, and runs
Expand Down
2 changes: 1 addition & 1 deletion loomengine/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.0
0.5.1
2 changes: 1 addition & 1 deletion loomengine/client/settings/gcloud.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ LOOM_STORAGE_ROOT: /loom-data
LOOM_ANSIBLE_HOST_KEY_CHECKING: False
LOOM_ANSIBLE_INVENTORY: gce_wrapper.py

LOOM_DOCKER_IMAGE: loomengine/loom:0.5.0
LOOM_DOCKER_IMAGE: loomengine/loom:0.5.1
LOOM_DEFAULT_DOCKER_REGISTRY: registry.hub.docker.com

LOOM_HTTP_PORT: 80
Expand Down
2 changes: 1 addition & 1 deletion loomengine/client/settings/local.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ LOOM_STORAGE_ROOT: ~/loom-data
LOOM_ANSIBLE_INVENTORY: localhost,
LOOM_ANSIBLE_HOST_KEY_CHECKING: False

LOOM_DOCKER_IMAGE: loomengine/loom:0.5.0
LOOM_DOCKER_IMAGE: loomengine/loom:0.5.1
LOOM_DEFAULT_DOCKER_REGISTRY: registry.hub.docker.com

LOOM_HTTP_PORT: 80
Expand Down

0 comments on commit c988276

Please sign in to comment.