summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-12-31 23:59:56 -0400
committerJoey Hess <joeyh@joeyh.name>2016-12-31 23:59:56 -0400
commit8740cd9716107c46f54ac7a9bf0d263528fec26a (patch)
tree1f32aced68ce347f938055cc5645a6596325301e
parentd4f9b46ab361085cf32a4938a4fc15ef2ffbf72a (diff)
releasing package git-annex version 6.20170101
-rw-r--r--CHANGELOG11
-rw-r--r--NEWS2
-rw-r--r--git-annex.cabal2
3 files changed, 8 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 338249ac6e..07dd3d84e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,12 @@
-git-annex (6.20170101) UNRELEASED; urgency=medium
+git-annex (6.20170101) unstable; urgency=medium
* XMPP support has been removed from the assistant in this release.
If your repositories used XMPP to keep in sync, that will no longer
work, and you should enable some other remote to keep them in sync.
A ssh server is one way, or use the new Tor pairing feature.
- * p2p --pair makes it easy to pair repositories, using
+ * p2p --pair makes it easy to pair repositories, over Tor, using
Magic Wormhole codes to find the other repository.
+ See http://git-annex.branchable.com/tips/peer_to_peer_network_with_tor/
* webapp: The "Share with a friend" and "Share with your other devices"
pages have been changed to pair repositories using Tor and Magic Wormhole.
* metadata --batch: Fix bug when conflicting metadata changes were
@@ -22,13 +23,13 @@ git-annex (6.20170101) UNRELEASED; urgency=medium
* p2p: --link no longer takes a remote name, instead the --name
option can be used.
* Linux standalone: Improve generation of locale definition files,
- supporting locales such as, en_GB.UTF-8.
+ supporting locales such as en_GB.UTF-8.
* rekey --force: Incorrectly marked the new key's content as being
present in the local repo even when it was not.
* enable-tor: Put tor sockets in /var/lib/tor-annex/, rather
than in /etc/tor/hidden_service/.
* enable-tor: No longer needs to be run as root.
- * enable-tor: When run as a regular user, test a connection back to
+ * enable-tor: When run as a regular user, also tests a connection back to
the hidden service over tor.
* Support all common locations of the torrc file.
* Always use filesystem encoding for all file and handle reads and
@@ -37,7 +38,7 @@ git-annex (6.20170101) UNRELEASED; urgency=medium
* Debian: Suggest tor and magic-wormhole.
* Debian: Build webapp on armel.
- -- Joey Hess <id@joeyh.name> Sun, 11 Dec 2016 21:29:51 -0400
+ -- Joey Hess <id@joeyh.name> Sat, 31 Dec 2016 15:11:04 -0400
git-annex (6.20161210) unstable; urgency=medium
diff --git a/NEWS b/NEWS
index 0e3db783fd..5af1aa12c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-git-annex (6.20170101) unstable; urgency=low
+git-annex (6.20170101) unstable; urgency=medium
XMPP support has been removed from the assistant in this release.
diff --git a/git-annex.cabal b/git-annex.cabal
index b58f40e32a..5b95a16b74 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 6.20161210
+Version: 6.20170101
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <id@joeyh.name>