aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-05-22 14:20:01 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-05-22 14:20:21 -0400
commitabbd6155710cd9c9ab49bedea9200978f67daab3 (patch)
tree3d31900e33ee5e26d1cd15d8c48537455d12492f
parent85e269a49cc551db593d0458818873836443b54b (diff)
prep release
-rw-r--r--debian/changelog12
-rw-r--r--git-annex.cabal2
2 files changed, 7 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 3ada531a6..58525853e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-git-annex (5.20150508.2) UNRELEASED; urgency=medium
+git-annex (5.20150522) unstable; urgency=medium
* import: Refuse to import files that are within the work tree, as that
does not make sense and could cause data loss.
@@ -10,7 +10,7 @@ git-annex (5.20150508.2) UNRELEASED; urgency=medium
However, progress bars are not yet displayed for concurrent transfers,
pending an updated version of the ascii-progress library.
* --quiet now makes progress output by rsync, wget, etc be quiet too.
- * Take space that will be used by running downloads into account when
+ * Take space that will be used by other running downloads into account when
checking annex.diskreserve.
* Avoid accumulating transfer failure log files unless the assistant is
being used.
@@ -18,9 +18,9 @@ git-annex (5.20150508.2) UNRELEASED; urgency=medium
running at once.
* Stale transfer lock and info files will be cleaned up automatically
when get/unused/info commands are run.
- * unused: Add --used-refspec option and annex.used-refspec, which can specify
- a set of refs to consider used, rather than the default of considering
- all refs used.
+ * unused: Add --used-refspec option and annex.used-refspec, which can
+ specify a set of refs to consider used, rather than the default of
+ considering all refs used.
* webapp: Fix zombie xdg-open process left when opening file browser.
Closes: #785498
* Safer posix fctnl locking implementation, using lock pools and STM.
@@ -29,7 +29,7 @@ git-annex (5.20150508.2) UNRELEASED; urgency=medium
upgrade code will find it. Fixes OSX upgrade going forward, but
older versions won't upgrade themselves due to this problem.
- -- Joey Hess <id@joeyh.name> Mon, 11 May 2015 12:45:06 -0400
+ -- Joey Hess <id@joeyh.name> Fri, 22 May 2015 14:20:18 -0400
git-annex (5.20150508.1) unstable; urgency=medium
diff --git a/git-annex.cabal b/git-annex.cabal
index cf9af63f7..25b1b6438 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 5.20150508.1
+Version: 5.20150522
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <id@joeyh.name>