Merge pull request #5346 from benjaoming/static-caching

Cautiously upgrade CherryPy to 3.3.0 - fixes #5317
learningequality · Nov 29, 2016 · 2892094 · 2892094
2 parents 950d1f0 + 5a2edf6
commit 2892094
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/docs/installguide/release_notes.rst b/docs/installguide/release_notes.rst
@@ -17,6 +17,7 @@ New features
    :url-issue:`5342` -
    (Thanks: Jonathan Field)
 
+
 Bug fixes
 ^^^^^^^^^
 
@@ -31,6 +32,7 @@ Bug fixes
  * New setting ``HIDE_CONTENT_RATING`` for hiding content rating box :url-issue:`5104`
  * Redirect to front page if user logs in from the signup page :url-issue:`3926`
  * Progress bar missing when decimals in progress percentage :url-issue:`5321`
+ * Missing cache invalidation for JavaScript meant client-side breakage: Upgraded CherryPy HTTP server to 3.3.0 :url-issue:`5317`
 
 
 Known issues

diff --git a/requirements.txt b/requirements.txt
@@ -19,7 +19,7 @@ django-appconf==1.0.1
 peewee==2.6.4
 python-dateutil==2.4.2
 django-annoying==0.8.4
-cherrypy==3.2.2
+cherrypy==3.3.0
 ifcfg==0.9.3
 importlib==1.0.3
 pbkdf2==1.3