Merge pull request #340 from sjberman/cherrypick

Cherrypick
F5Networks · Apr 26, 2018 · 3883adc · 3883adc
2 parents e5736f7 + aeafcd1
commit 3883adc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/docs/RELEASE-NOTES.rst b/docs/RELEASE-NOTES.rst
@@ -1,6 +1,13 @@
 Release Notes for F5 BIG-IP Controller for Marathon
 ===================================================
 
+v1.3.1
+-----
+
+Bug Fixes
+`````````
+* :issues:`339` - Controller upgrades properly with new metadata field.
+
 v1.3.0
 ------
 
@@ -13,6 +20,11 @@ Bug Fixes
 `````````
 * :issues:`314` - Support new health-check protocols (MESOS_HTTP, MESOS_HTTPS, and MESOS_TCP) introduced in DC/OS 1.10.
 
+Limitations
+```````````
+* If an older controller created resources, upgrading to the new version could result in a python exception when
+  adding metadata to virtuals: :issues:`339`
+
 v1.2.2
 ------
 

diff --git a/marathon-build-requirements.txt b/marathon-build-requirements.txt
@@ -1,5 +1,5 @@
 pytest==3.0.2
--e git+https://github.com/f5devcentral/f5-cccl.git@8a3663ba4d401eed6ba428a14b4b629b983c772f#egg=f5-cccl
+-e git+https://github.com/f5devcentral/f5-cccl.git@39835ebf3d7cf38c6ce2fbec883be7b18b6ba5ff#egg=f5-cccl
 cryptography==1.3.2
 flake8==3.2.1
 # Cannot use flake8_docstrings until https://gitlab.com/pycqa/flake8-docstrings/issues/19 is fixed.

diff --git a/marathon-runtime-requirements.txt b/marathon-runtime-requirements.txt
@@ -1,4 +1,4 @@
--e git+https://github.com/f5devcentral/f5-cccl.git@8a3663ba4d401eed6ba428a14b4b629b983c772f#egg=f5-cccl
+-e git+https://github.com/f5devcentral/f5-cccl.git@39835ebf3d7cf38c6ce2fbec883be7b18b6ba5ff#egg=f5-cccl
 cryptography==1.3.2
 idna==2.2
 pyasn1==0.2.2