Merge branch 'master' into no-xmpp

3 files changed, 48 insertions, 30 deletions

diff --git a/doc/news/version_6.20161012.mdwn b/doc/news/version_6.20161012.mdwn
deleted file mode 100644
index a6cb01780..000000000
--- a/doc/news/version_6.20161012.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-git-annex 6.20161012 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Optimisations to time it takes git-annex to walk working tree and find
-     files to work on. Sped up by around 18%.
-   * Optimisations to git-annex branch query and setting, avoiding repeated
-     copies of the environment. Speeds up commands like
-     "git-annex find --in remote" by over 50%.
-   * Optimised git-annex branch log file timestamp parsing.
-   * Add "total-size" field to --json-progress output.
-   * Make --json-progress output be shown even when the size of a object
-     is not known.
-   * Multiple external special remote processes for the same remote will be
-     started as needed when using -J. This should not beak any existing
-     external special remotes, because running multiple git-annex commands
-     at the same time could already start multiple processes for the same
-     external special remotes.
-   * Linux standalone: Include locale files in the bundle, and generate
-     locale definition files for the locales in use when starting runshell.
-     (Currently only done for utf-8 locales.)
-   * Avoid using a lot of memory when large objects are present in the git
-     repository and have to be checked to see if they are a pointed to an
-     annexed file. Cases where such memory use could occur included, but
-     were not limited to:
-     - git commit -a of a large unlocked file (in v5 mode)
-     - git-annex adjust when a large file was checked into git directly
-   * When auto-upgrading a v3 remote, avoid upgrading to version 6,
-     instead keep it at version 5.
-   * Support using v3 repositories without upgrading them to v5.
-   * sync: Fix bug in adjusted branch merging that could cause recently
-     added files to be lost when updating the adjusted branch."""]]
\ No newline at end of file
diff --git a/doc/news/version_6.20161118.mdwn b/doc/news/version_6.20161118.mdwn
new file mode 100644
index 000000000..42d86282c
--- /dev/null
+++ b/doc/news/version_6.20161118.mdwn
@@ -0,0 +1,17 @@
+git-annex 6.20161118 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * git-annex.cabal: Loosen bounds on persistent to allow 2.5, which
+     on Debian has been patched to work with esqueleto.
+     This may break cabal's resolver on non-Debian systems;
+     if so, either use stack to build, or run cabal with
+     --constraint='persistent ==2.2.4.1'
+     Hopefully this mess with esqueleto will be resolved soon.
+   * sync: Pass --allow-unrelated-histories to git merge when used with git
+     git 2.9.0 or newer. This makes merging a remote into a freshly created
+     direct mode repository work the same as it works in indirect mode.
+   * Avoid backtraces on expected failures when built with ghc 8;
+     only use backtraces for unexpected errors.
+   * fsck --all --from was checking the existence and content of files
+     in the local repository, rather than on the special remote. Oops.
+   * Linux arm standalone: Build with a 32kb page size, which is needed
+     on several ARM NAS devices, including Drobo 5N, and WD NAS."""]]
\ No newline at end of file
diff --git a/doc/news/version_6.20161210.mdwn b/doc/news/version_6.20161210.mdwn
new file mode 100644
index 000000000..345d4fe4c
--- /dev/null
+++ b/doc/news/version_6.20161210.mdwn
@@ -0,0 +1,31 @@
+git-annex 6.20161210 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Linux standalone: Updated ghc to fix its "unable to decommit memory"
+     bug, which may have resulted in data loss when these builds were used
+     with Linux kernels older than 4.5.
+   * enable-tor: New command, enables tor hidden service for P2P syncing.
+   * p2p: New command, allows linking repositories using a P2P network.
+   * remotedaemon: Serve tor hidden service.
+   * Added git-remote-tor-annex, which allows git pull and push to the tor
+     hidden service.
+   * remotedaemon: Fork to background by default. Added --foreground switch
+     to enable old behavior.
+   * addurl: Fix bug in checking annex.largefiles expressions using
+     largerthan, mimetype, and smallerthan; the first two always failed
+     to match, and the latter always matched.
+   * Relicense 5 source files that are not part of the webapp from AGPL to GPL.
+   * map: Run xdot if it's available in PATH. On OSX, the dot command
+     does not support graphical display, while xdot does.
+   * Debian: xdot is a better interactive viewer than dot, so Suggest
+     xdot, rather than graphviz.
+   * rmurl: Multiple pairs of files and urls can be provided on the
+     command line.
+   * rmurl: Added --batch mode.
+   * fromkey: Accept multiple pairs of files and keys.
+     Thanks, Daniel Brooks.
+   * rekey: Added --batch mode.
+   * add: Stage modified non-large files when running in indirect mode.
+     (This was already done in v6 mode and direct mode.)
+   * git-annex-shell, remotedaemon, git remote: Fix some memory DOS attacks.
+   * Fix build with http-client 0.5.
+     Thanks, Alper Nebi Yasak."""]]