Merge branch 'hotfix/intersphinx'

uw-dims · Aug 14, 2017 · d911e91 · d911e91
2 parents 79b371e + fee0f4c
commit d911e91
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 15 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.10.1
+current_version = 2.10.2
 commit = True
 tag = False
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.10.1
+2.10.2
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -77,9 +77,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.10.1'
+version = '2.10.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.10.1'
+release = '2.10.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -3,6 +3,8 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
+.. _ansible_dims_playbooks:
+
 DIMS Ansible playbooks v |release|
 ==================================
 

diff --git a/files/common-scripts/dims.ansible-playbook.sh b/files/common-scripts/dims.ansible-playbook.sh
@@ -37,7 +37,7 @@
 FACTSD="/opt/dims/data/facts.d"
 
 # Tracks with bumpversion
-DIMS_VERSION=2.10.1
+DIMS_VERSION=2.10.2
 
 DEPLOYMENT=${DIMS_DEPLOYMENT:-$(get_deployment)}
 CATEGORY=${DIMS_CATEGORY:-devops}

diff --git a/files/common-scripts/dims.function.sh b/files/common-scripts/dims.function.sh
@@ -39,7 +39,7 @@ else
 fi
 
 # Tracks with bumpversion
-DIMS_VERSION=2.10.1
+DIMS_VERSION=2.10.2
 
 # Define command line options
 DEFINE_boolean 'debug' false 'enable debug mode' 'd'

diff --git a/files/common-scripts/dims.install.createusb.py b/files/common-scripts/dims.install.createusb.py
@@ -71,7 +71,7 @@
 from sh import Command
 
 # Managed by bumpversion
-VERSION = "2.10.1"
+VERSION = "2.10.2"
 
 # Define a globals class
 class mem(object):

diff --git a/files/common-scripts/dims.logger.j2 b/files/common-scripts/dims.logger.j2
@@ -41,7 +41,7 @@ LOGGER_TAG="$BASE"
 LOGMON_EXCHANGE="logs"
 
 # Tracks with bumpversion
-DIMS_VERSION=2.10.1
+DIMS_VERSION=2.10.2
 
 FLAGS_HELP="usage: $BASE [options] message"
 

diff --git a/files/common-scripts/dims.shutdown.sh b/files/common-scripts/dims.shutdown.sh
@@ -33,7 +33,7 @@
 . $DIMS/bin/dims_functions.sh
 
 # Tracks with bumpversion
-DIMS_VERSION=2.10.1
+DIMS_VERSION=2.10.2
 
 # This script is designed to handle shutting down Vagrants before
 # the VM host, so DEPLOYMENT here applies to the Vagrants.

diff --git a/files/common-scripts/dims.sphinx-autobuild.sh b/files/common-scripts/dims.sphinx-autobuild.sh
@@ -40,7 +40,7 @@
 export DOCSURL=${DOCSURL:-file://${GIT}}
 
 # Tracks with bumpversion
-DIMS_VERSION=2.10.1
+DIMS_VERSION=2.10.2
 
 DEFINE_boolean 'debug' false 'enable debug mode' 'd'
 DEFINE_integer 'delay' 5 'browser open delay' 'D'

diff --git a/files/common-scripts/trigger.runner.sh b/files/common-scripts/trigger.runner.sh
@@ -36,7 +36,7 @@
 . $DIMS/bin/dims_functions.sh
 
 # Tracks with bumpversion
-DIMS_VERSION=2.10.1
+DIMS_VERSION=2.10.2
 
 TRIGGERDIR=${TRIGGERDIR:-$DIMS/triggers.d}
 TRIGGERSTATE=${TRIGGERSTATE:-''}

diff --git a/roles/python-virtualenv/templates/scripts/dimsenv.build.j2 b/roles/python-virtualenv/templates/scripts/dimsenv.build.j2
@@ -36,7 +36,7 @@
 . $DIMS/bin/dims_functions.sh
 
 # Tracks with bumpversion
-DIMS_VERSION=2.10.1
+DIMS_VERSION=2.10.2
 
 DIMS_ETC=${DIMS_ETC:-{{ dims_etc }}}
 DIMS_BIN=${DIMS_BIN:-{{ dims_bin }}}

diff --git a/roles/python-virtualenv/templates/scripts/dimsenv.update.j2 b/roles/python-virtualenv/templates/scripts/dimsenv.update.j2
@@ -36,7 +36,7 @@
 . $DIMS/bin/dims_functions.sh
 
 # Tracks with bumpversion
-DIMS_VERSION=2.10.1
+DIMS_VERSION=2.10.2
 
 VENV=${VENV:-{{ venv_name }}}
 ENVS=$HOME/dims/envs

diff --git a/roles/vncserver/templates/scripts/vnc.sh.j2 b/roles/vncserver/templates/scripts/vnc.sh.j2
@@ -34,7 +34,7 @@
 . $DIMS/bin/dims_functions.sh
 
 # Tracks with bumpversion
-DIMS_VERSION=2.10.1
+DIMS_VERSION=2.10.2
 
 ANSIBLE_USER=${ANSIBLE_USER:-{{ hostvars[inventory_hostname].ansible_user }}}
 SSH_PORT=${SSH_PORT:-{{ hostvars[inventory_hostname].ansible_port }}}

diff --git a/vars/global.yml b/vars/global.yml
@@ -97,7 +97,7 @@ zones: []
 # The following is managed using "bumpversion". See the
 # dims-ci-utils documentation.
 
-ansibleplaybooks_version: "2.10.1"
+ansibleplaybooks_version: "2.10.2"
 
 # Set Python interpreter to be one from DIMS Python virtual
 # environment (the global one, although would be ideal to