Commit Graph

126 Commits

Author SHA1 Message Date
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 72a73f55fa Merge branch '1.10' into 1.11
Conflicts:
	fabfile.py
	paramiko/__init__.py
2014-03-03 18:24:04 -08:00
Jeff Forcier 91c47b1748 s/python/Python/, c'mon son! 2014-02-21 15:46:58 -08:00
Jeff Forcier 0e9a5a4b46 Move module level docstring into Sphinx docs 2014-02-21 14:31:08 -08:00
Jeff Forcier f836c98e5c Don't actually need :class: anywhere now 2014-02-21 12:16:11 -08:00
Jeff Forcier f09b562fa8 Replace accidental class-refs on local method-refs 2014-02-21 12:15:29 -08:00
Jeff Forcier 3f9270c0be Mass SnR of class refs with dotted ones.
Boo on Sphinx for not letting me just change this behavior
by default.

There are a handful of incorrect items here that will get
tweaked later.
2014-02-21 11:11:10 -08:00
Jeff Forcier 3b0df60b6a This handily explains why everything was really confusing in autodoc 2014-02-14 16:49:29 -08:00
Jeff Forcier 6cdb8291b7 Merge branch '1.10' into sphinx-256 2014-02-14 12:10:02 -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
Olle Lundberg 24635609dc Epydoc -> Sphinx. 2014-01-23 11:32:59 +01: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 75c4304fe2 Merge branch '1.10' into 1.11
Conflicts:
	paramiko/__init__.py
2013-10-16 17:00:46 -07:00
Jeff Forcier 3232ce84ed Merge branch '1.9' into 1.10
Conflicts:
	paramiko/__init__.py
2013-10-16 17:00:33 -07:00
Jeff Forcier 858d3fd07f Merge branch '1.8' into 1.9
Conflicts:
	paramiko/__init__.py
2013-10-16 17:00:13 -07:00
Mike Gabriel 6b222528f3 Reintroduce __version_info__ variable
At least one application (mysql-workbench) (used to) use(s) the __version_info__
that got removed by commit 99859b8b02.

Breaking existing software with new versions of paramiko should be avoided.
This pull-request reintroduces the __version_info__ var, but fills it
from the __version__ var. No need to maintain multiple version strings.

Conflicts:
	paramiko/__init__.py
2013-10-16 16:59:35 -07: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 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 bea7d9dc8a Christ almighty I hate non-DRY versioning 2013-09-20 18:01:42 -07:00
Jeff Forcier 2a08a48dd2 Version bump/dumb-fix 2013-07-26 15:07:33 -07:00
Jeff Forcier d2c71ed999 Merge branch '1.10'
Conflicts:
	NEWS
	setup.py
2013-07-26 15:06:58 -07:00
Jeff Forcier 965d00dee9 Version bump 2013-07-26 15:05:35 -07:00
Jeff Forcier ba3ce80c14 Add ML link to docs 'index'
Fixes #48
2013-06-28 13:07:19 -07:00
Jeff Forcier 02d071be07 Bump version to 1.10.1 2013-04-05 13:00:19 -07:00
Jeff Forcier 0c56e2a40b Merge branch '1.9' 2013-02-03 11:52:36 -08:00
Jeff Forcier 6284666cfd Merge branch '1.8' into 1.9 2013-02-03 11:52:30 -08:00
Jeff Forcier bf87cd124d Update explicitly-stated Python version reqs to 2.5+ 2013-02-03 11:52:11 -08: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 308c5f57d9 Add ProxyCommand classes to top level API 2012-11-05 23:09:52 -08:00
Jeff Forcier 30a2d14b78 Init header update 2012-09-25 18:05:01 -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
Jeff Forcier 01735419f3 Bump to 1.7.14
(cherry picked from commit c3a7e9d587)

Conflicts:
	setup.py
2012-09-23 16:20:01 -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 3d598a64b4 Add IO sleep to agent forward communications.
Without this, use of agent forwarding causes
high CPU usage on some clients.
(cherry picked from commit 3030589aaa)

Conflicts:
	paramiko/agent.py
2012-09-23 16:08:35 -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 903646677b Bump dev version
(cherry picked from commit 59cae8560b)
2012-09-23 16:03:58 -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 99859b8b02 Update version to 1.7.8, no need for 4 parts
(cherry picked from commit 5e0a329028)

Conflicts:
	README
	paramiko/__init__.py
	setup.py
2012-09-23 14:28:34 -07:00
Jeff Forcier 322819454d Increment version for release 2012-05-16 16:03:10 -07:00
Robey Pointer 7bcbc24198 version 1.7.7.1 2011-05-23 13:49:47 -07:00