Merge pull request #1679 from mboersma/update-django-166

mboersma · mboersma · commit dade3df7aef5 · 2014-08-25T09:19:17.000-06:00
chore(controller): update django to 1.6.6 security release
diff --git a/controller/requirements.txt b/controller/requirements.txt
@@ -4,7 +4,7 @@
 # ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]
 #
 celery==3.1.13
-Django==1.6.5
+Django==1.6.6
 django-allauth==0.15.0
 # HACK: use bacongobbler's feature branch until
 # https://github.com/kmmbvnr/django-fsm/pull/31 is merged
diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt
@@ -8,7 +8,7 @@
 # ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]
 #
 celery==3.1.13
-Django==1.6.5
+Django==1.6.6
 django-allauth==0.15.0
 # HACK: use bacongobbler's feature branch until
 # https://github.com/kmmbvnr/django-fsm/pull/31 is merged

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`# ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]`
`5`	`5`	`#`
`6`	`6`	`celery==3.1.13`
`7`		`-Django==1.6.5`
	`7`	`+Django==1.6.6`
`8`	`8`	`django-allauth==0.15.0`
`9`	`9`	`# HACK: use bacongobbler's feature branch until`
`10`	`10`	`# https://github.com/kmmbvnr/django-fsm/pull/31 is merged`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`# ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future pip install [args]`
`9`	`9`	`#`
`10`	`10`	`celery==3.1.13`
`11`		`-Django==1.6.5`
	`11`	`+Django==1.6.6`
`12`	`12`	`django-allauth==0.15.0`
`13`	`13`	`# HACK: use bacongobbler's feature branch until`
`14`	`14`	`# https://github.com/kmmbvnr/django-fsm/pull/31 is merged`