summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-09-15 10:47:01 -0400
committerJoey Hess <joey@kitenet.net>2014-09-15 10:47:10 -0400
commit05e7518c3ecc08175a30d628f67bcccf3d0b4ff9 (patch)
tree95576ce7d1fc4a5270e595ee5b7f184fcdbbe417
parent93b8da148ebb00c67c3273f5fe8e1d1ea1c88245 (diff)
-rw-r--r--debian/changelog10
-rw-r--r--git-annex.cabal2
2 files changed, 7 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index aa7fd6dd6d..4986b323e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
-git-annex (5.20140832) UNRELEASED; urgency=medium
+git-annex (5.20140915) unstable; urgency=medium
- * webapp: Fixed visual glitch in xmpp pairing.
* New annex.hardlink setting. Closes: #758593
* init: Automatically detect when a repository was cloned with --shared,
and set annex.hardlink=true, as well as marking the repository as
@@ -15,7 +14,7 @@ git-annex (5.20140832) UNRELEASED; urgency=medium
git-annex processes were both working to perform the same set of
transfers.
* sync: Ensure that pending changes to git-annex branch are committed
- when in direct mode. (Fixing a very minor reversion.)
+ before push when in direct mode. (Fixing a very minor reversion.)
* WORM backend: Switched to include the relative path to the file inside
the repository, rather than just the file's base name. Note that if you're
relying on such things to keep files separate with WORM, you should really
@@ -23,8 +22,11 @@ git-annex (5.20140832) UNRELEASED; urgency=medium
* Rather than crashing when there's a problem with the requested bloomfilter
capacity/accuracy, fall back to a reasonable default bloom filter size.
* Fix build with optparse-applicative 0.10. Closes: #761484
+ * webapp: Fixed visual glitch in xmpp pairing that was reported live by a
+ user who tracked me down in front of a coffee cart in Portland.
+ (New bug reporting method of choice?)
- -- Joey Hess <joeyh@debian.org> Thu, 04 Sep 2014 16:17:22 -0400
+ -- Joey Hess <joeyh@debian.org> Mon, 15 Sep 2014 10:45:00 -0400
git-annex (5.20140831) unstable; urgency=medium
diff --git a/git-annex.cabal b/git-annex.cabal
index 8471a6b5e4..48c25d9451 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 5.20140831
+Version: 5.20140915
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <joey@kitenet.net>