Commit Graph

96 Commits

Author SHA1 Message Date
Jeff Forcier 09e9d48db0 Cut 1.12.4 2014-05-07 13:47:09 -07:00
Jeff Forcier 4ba5ae6135 Merge branch '1.11' into 1.12 2014-03-21 11:21:20 -07:00
Jeff Forcier 2af6081eaf Forgot python 2.5 2014-03-21 11:21:17 -07:00
Jeff Forcier a749c83aa8 Merge branch '1.11' into 1.12
Conflicts:
	setup.py
2014-03-21 11:16:51 -07:00
Jeff Forcier 695527c9ee Indent/order shuffle, no actionable changes 2014-03-21 11:09:31 -07:00
Jeff Forcier 233f53bb37 Backport alex/patch-2, Python trove classifiers 2014-03-21 11:06:15 -07:00
Jeff Forcier bbd9469d65 Cut 1.12.3 2014-03-13 21:30:11 -07:00
Jeff Forcier c538a00012 Merge branch '1.10' into 1.11.
Also bump versions like a dummy.

Conflicts:
	paramiko/__init__.py
	setup.py
2014-03-13 21:27:46 -07:00
Jeff Forcier 4fdb4b5ae5 Cut 1.10.7 2014-03-13 21:25:44 -07:00
Jeff Forcier fb786bea9c Cut 1.12.2 2014-02-14 09:39:11 -08:00
Jeff Forcier 4a5f007c02 Cut 1.11.4 2014-02-14 09:38:14 -08:00
Jeff Forcier 457a34f55b Cut 1.10.6 2014-02-14 09:36:33 -08:00
Jeff Forcier 6ecde066fc Cut 1.12.1 2014-01-08 16:41:44 -08:00
Jeff Forcier 1ff3db96f6 Cut 1.11.3 2014-01-08 16:41:04 -08:00
Jeff Forcier 698adf10fb Cut 1.10.5 2014-01-08 16:40:11 -08:00
Jeff Forcier 96fdefbcb9 Merge branch '1.10' into 1.11
Updated versions for 1.11.2.

Conflicts:
	paramiko/__init__.py
	setup.py
2013-09-27 22:00:32 -07:00
Jeff Forcier f2466a3d46 Update version for 1.10.4 2013-09-27 21:59:48 -07:00
Jeff Forcier 28d78e4e6a Merge branch '1.11' 2013-09-27 21:29:59 -07:00
Jeff Forcier 07e61c3552 Merge branch '1.10' into 1.11 2013-09-27 21:29:56 -07:00
Jeff Forcier e25c7c4bdf Merge branch '1.9' into 1.10 2013-09-27 21:29:51 -07:00
Jeff Forcier 2de9c72720 Merge branch '1.8' into 1.9 2013-09-27 21:29:41 -07:00
Jeff Forcier 83f44878ea Fixed a typo in the license header of most files
Conflicts:
	paramiko/proxy.py
2013-09-27 21:29:18 -07:00
Jeff Forcier e0b401b8d9 Merge branch '152-int' into 152-real-int
Conflicts:
	paramiko/hostkeys.py
	requirements.txt
2013-09-27 17:50:25 -07:00
Jeff Forcier 8ab4cbd2a0 Bump version for dev 2013-09-27 17:44:06 -07:00
Jeff Forcier 2de0784d4e Versions: hard? 2013-09-20 17:57:23 -07:00
Jeff Forcier 0ba34035c3 Not sure how this got updated :( 2013-09-20 17:56:20 -07:00
Jeff Forcier 777d1576ca Bump dev version 2013-04-28 19:01:40 -07:00
Jeff Forcier 02d071be07 Bump version to 1.10.1 2013-04-05 13:00:19 -07:00
Ethan Glasser-Camp 632129c427 Introduce ECDSA
This just adds tests; hooking this up with paramiko comes in the next
commit.
2013-03-25 12:19:21 -04:00
Jeff Forcier 10c51e2726 Bump dev version to 1.10 2012-11-28 22:18:44 -08:00
Jeff Forcier 7f4c26f860 Cut 1.8.1 2012-11-06 13:08:41 -08:00
Jeff Forcier a3b44c7ed9 Bump to 1.9.0 for release 2012-11-06 13:06:08 -08:00
Jeff Forcier 09488c665b 80-col fix 2012-09-25 22:09:49 -07:00
Jeff Forcier 71456b8990 Correct dev-installation doc in package metadata 2012-09-25 18:10:28 -07:00
Jeff Forcier dd6fb2577d Bump to 0.8.x due to nontrivial changes
(cherry picked from commit d7def60c4784fed39fc8714753304a150da131c7)

Conflicts:
	setup.py
2012-09-24 19:00:19 -07:00
Laurent Peuch 400ea089d5 add the url to github in the setup.py for pypi
(cherry picked from commit abfefc2f95c377cc134d9b0b71c8cdd692f321c8)

Conflicts:
	setup.py
2012-09-24 18:56:20 -07:00
Jeff Forcier 01735419f3 Bump to 1.7.14
(cherry picked from commit c3a7e9d587)

Conflicts:
	setup.py
2012-09-23 16:20:01 -07:00
Bobby Impollonia bd5c843040 Replace hard tabs with spaces
(cherry picked from commit c07eddb9e1)
2012-09-23 16:18:56 -07:00
Silas Sewell e375d671a4 Fix FSF address
(cherry picked from commit 4db2ca594b)

CHANGED: only applied the address change to LICENSE and setup.py.

Rest left untouched. :effort:
2012-09-23 16:16:57 -07:00
Jeff Forcier 11ca8134a2 Cut 1.7.13
(cherry picked from commit 998377f353)

Conflicts:
	setup.py
2012-09-23 16:11:18 -07:00
Jeff Forcier ac7f513ee8 Release 1.7.12
(cherry picked from commit c630917d0d)

Conflicts:
	paramiko/__init__.py
	setup.py
2012-09-23 16:09:44 -07:00
Jeff Forcier c903245ed9 Trying something stupid re: ==dev
(cherry picked from commit 543651bfd2)

Conflicts:
	setup.py
2012-09-23 16:07:40 -07:00
Jeff Forcier d3b48e9b44 Bump to 1.7.11
(cherry picked from commit 9234baed01)

Conflicts:
	paramiko/__init__.py
	setup.py
2012-09-23 16:07:03 -07:00
Jeff Forcier 10beb86e9e Partially revert centralized version stuff
(cherry picked from commit d9ba7a644c)

Conflicts:
	setup.py
2012-09-23 16:05:00 -07:00
Jeff Forcier 013d459487 Goofed up the RST
(cherry picked from commit 175075e045)
2012-09-23 16:04:10 -07:00
Jeff Forcier 7b7b23572b Let's not have 5 different freakin version strings
Also bumps to 1.7.10
(cherry picked from commit 01eea3326a)

Conflicts:
	README
	paramiko/__init__.py
	paramiko/transport.py
	setup.py
2012-09-23 16:03:38 -07:00
Jeff Forcier 5f839942c7 add ==dev install URL to setup.py
(cherry picked from commit e72b53788d)
2012-09-23 15:56:08 -07:00
Jeff Forcier a94f73a392 Bump to 1.7.9, setup.py/crypto update
(cherry picked from commit ea8e73a389)

Conflicts:
	setup.py
2012-09-23 14:37:44 -07:00
Jeff Forcier 987de8e7d5 Crypto released a setuptools bugfix as 2.4.1.
(cherry picked from commit 2279ef6909)
2012-09-23 14:36:56 -07:00
Jeff Forcier 96d8eafc47 Crypto 2.4 doesn't play well with setup.py/setuptools
(cherry picked from commit 12cf1674fc)
2012-09-23 14:36:36 -07:00