diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-18 11:19:35 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-18 11:19:35 -0800 |
| commit | b3884d2c44233f16cd334c4abcfddcf5e8bf8ef6 (patch) | |
| tree | 107d26c33a7fb1428bda2ed5be9b9e2e09277c72 /.travis.yml | |
| parent | 37756f3a8892dbb41dfda74dcf37e21053bf4e34 (diff) | |
| parent | 681f32583fe052c0516a2fda67e163169676ad11 (diff) | |
Merge branch 'master' into switch-to-cryptography
Conflicts:
paramiko/ecdsakey.py
paramiko/util.py
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 0bda3da9..80ecb21d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python +sudo: false python: - "2.6" - "2.7" |