diff options
author | 2016-12-24 14:48:51 -0400 | |
---|---|---|
committer | 2016-12-24 15:01:55 -0400 | |
commit | 42e08cd4575d3dc558dfe172c1f28c752d69e8c6 (patch) | |
tree | 78a8eddc31c390aaf8f66435bb13db9366f9a7c4 /doc/news/version_6.20161118.mdwn | |
parent | 34f375526f44ff255d45bbabcd1425b3d5d0bb4a (diff) | |
parent | 3b9d9a267b7c9247d36d9b622e1b836724ca5fb0 (diff) |
Merge branch 'master' into no-xmpp
Diffstat (limited to 'doc/news/version_6.20161118.mdwn')
-rw-r--r-- | doc/news/version_6.20161118.mdwn | 17 |
1 files changed, 17 insertions, 0 deletions
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 |