Merge pull request deis#2896 from mboersma/update-django

chore(controller): update Django to 1.6.10 security release
sbuss · Jan 14, 2015 · 2346c11 · 2346c11
2 parents f12b802 + a57cabf
commit 2346c11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/controller/requirements.txt b/controller/requirements.txt
@@ -3,7 +3,7 @@
 # NOTE: For testing on Mac OS X Mavericks, use the following to work around a clang issue:
 # ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]
 #
-Django==1.6.9
+Django==1.6.10
 # FIXME: switch to upstream pending merge of https://github.com/kmmbvnr/django-fsm/pull/59
 git+https://github.com/deis/django-fsm@propagate-false
 django-cors-headers==1.0.0

diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt
@@ -7,7 +7,7 @@
 # NOTE: For testing on Mac OS X Mavericks, use the following to work around a clang issue:
 # ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]
 #
-Django==1.6.9
+Django==1.6.10
 # FIXME: switch to upstream pending merge of https://github.com/kmmbvnr/django-fsm/pull/59
 git+https://github.com/deis/django-fsm@propagate-false
 django-cors-headers==1.0.0