Merge branch 'master' into pyup-update-tox-2.5.0-to-2.6.0

ClimateImpactLab · Feb 7, 2017 · bf038fd · bf038fd
2 parents 788afb4 + a97c2e6
commit bf038fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -4,5 +4,5 @@ Sphinx==1.5.2
 sphinx_rtd_theme==0.1.10a0
 boto==2.45.0
 boto3==1.4.3
-datafs==0.6.6
+datafs==0.6.8
 jinja2==2.9.4
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -4,7 +4,7 @@ Sphinx==1.5.2
 sphinx_rtd_theme==0.1.10a0
 boto==2.45.0
 boto3==1.4.3
-datafs==0.6.6
+datafs==0.6.8
 jinja2==2.9.4
 pip==9.0.1
 wheel==0.29.0