Merge pull request #2842 from mboersma/update-django

mboersma · mboersma · commit ab7835302d00 · 2015-01-09T18:02:19.000-07:00
chore(controller): update Django to 1.6.9 bugfix release
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.8
+Django==1.6.9
 # 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.8
+Django==1.6.9
 # 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

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# NOTE: For testing on Mac OS X Mavericks, use the following to work around a clang issue:`
`4`	`4`	`# ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]`
`5`	`5`	`#`
`6`		`-Django==1.6.8`
	`6`	`+Django==1.6.9`
`7`	`7`	`# FIXME: switch to upstream pending merge of https://github.com/kmmbvnr/django-fsm/pull/59`
`8`	`8`	`git+https://github.com/deis/django-fsm@propagate-false`
`9`	`9`	`django-cors-headers==1.0.0`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`# NOTE: For testing on Mac OS X Mavericks, use the following to work around a clang issue:`
`8`	`8`	`# ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]`
`9`	`9`	`#`
`10`		`-Django==1.6.8`
	`10`	`+Django==1.6.9`
`11`	`11`	`# FIXME: switch to upstream pending merge of https://github.com/kmmbvnr/django-fsm/pull/59`
`12`	`12`	`git+https://github.com/deis/django-fsm@propagate-false`
`13`	`13`	`django-cors-headers==1.0.0`