Merge pull request #37 from crate/m/version_conflicts

use argparse 1.1 to prevent version conflicts
crate · Jul 14, 2014 · 5779e8d · 5779e8d
2 parents 04d1ac5 + 34e1dcf
commit 5779e8d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/crate/crash/crash.txt b/src/crate/crash/crash.txt
@@ -63,14 +63,18 @@ them without any special arguments like this::
     +--------------------+-------------------+
     | sys                | cluster           |
     | information_schema | columns           |
+    | sys                | jobs              |
+    | sys                | jobs_log          |
     | sys                | nodes             |
+    | sys                | operations        |
+    | sys                | operations_log    |
     | information_schema | routines          |
     | sys                | shards            |
     | information_schema | table_constraints |
     | information_schema | table_partitions  |
     | information_schema | tables            |
     +--------------------+-------------------+
-    SELECT 8 rows in set (... sec)
+    SELECT 12 rows in set (... sec)
 
 
 Limitations

diff --git a/versions.cfg b/versions.cfg
@@ -5,7 +5,7 @@ zc.recipe.testrunner = 2.0.0
 setuptools = 1.1
 lovely.testlayers = 0.6.0
 
-crate_server = 0.38.4
+crate_server = 0.39.3
 crate = 0.10.2
 
 # Required by:
@@ -47,7 +47,7 @@ Jinja2 = 2.7.2
 MarkupSafe = 0.23
 Pygments = 1.6
 Sphinx = 1.2.2
-argparse = 1.2.1
+argparse = 1.1
 crate-docs-theme = 0.2.3
 docutils = 0.11
 wheel = 0.22.0