Merge remote-tracking branch 'origin/v1' into merging-from-v1

2016-07-23 14:52:58 -04:00 · 2016-07-23 14:52:58 -04:00 · c360161d62
commit c360161d62
parent 9646e60b1a 383ad23a88
2 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -27,7 +27,7 @@ matrix:
 before_script:
 - $pip_install flake8
 - go get github.com/urfave/gfmrun/...
- go get golang.org/x/tools/cmd/goimports
+- go get golang.org/x/tools/cmd/goimports || true
 - if [ ! -f node_modules/.bin/markdown-toc ] ; then
    npm install markdown-toc ;
  fi
--- a/2
+++ b/2
@ -107,7 +107,7 @@ def _toc():
@_target
 def _gen():
    go_version = check_output('go version'.split()).split()[2]
-    if go_version < 'go1.4':
+    if go_version < 'go1.5':
        print('runtests: skip on {}'.format(go_version), file=sys.stderr)
        return