Commit 6480cbea by Scott Duckworth

Merge branch 'release/1.1.1'

parents 02473503 9d3e6a3b
...@@ -5,4 +5,6 @@ include README.md ...@@ -5,4 +5,6 @@ include README.md
include lookup.py include lookup.py
include lookup.sh include lookup.sh
include openssh-6.2p2-authorized-keys-command-stdin.diff include openssh-6.2p2-authorized-keys-command-stdin.diff
recursive-include sshkey/management *.py
recursive-include sshkey/migrations *.py
recursive-include sshkey/templates.example * recursive-include sshkey/templates.example *
...@@ -6,6 +6,6 @@ bump __version__ in sshkey/__init__.py ...@@ -6,6 +6,6 @@ bump __version__ in sshkey/__init__.py
git add sshkey/__init__.py git add sshkey/__init__.py
git commit -m 'bump version' git commit -m 'bump version'
python setup.py sdist python setup.py sdist
git flow release finish X.Y.Z git flow release finish -m 'version X.Y.Z' X.Y.Z
git push origin master X.Y.Z git push origin master X.Y.Z
upload dist/django-sshkey-X.Y.Z.tar.gz to bitbucket upload dist/django-sshkey-X.Y.Z.tar.gz to bitbucket
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with django-sshkey. If not, see <http://www.gnu.org/licenses/>. # along with django-sshkey. If not, see <http://www.gnu.org/licenses/>.
__version__ = '1.1.0' __version__ = '1.1.1'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment