summaryrefslogtreecommitdiff
path: root/doc/assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-12 14:20:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-12 14:20:41 -0400
commitd4e54c2eba70ca4587c9ef0f9599a53225506e6f (patch)
treebca029eba2071672ee98f6a59fa0f1d20084786f /doc/assistant
parentdb4897aaff83f33e049cbe731ae16da96f340297 (diff)
parentb356a4f8d13ca9e1e2d68b17dd0b7b93143c8ef5 (diff)
Merge branch 'master' into remotecontrol
Conflicts: debian/changelog
Diffstat (limited to 'doc/assistant')
-rw-r--r--doc/assistant/connection.pngbin0 -> 3181 bytes
-rw-r--r--doc/assistant/release_notes.mdwn11
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/assistant/connection.png b/doc/assistant/connection.png
new file mode 100644
index 000000000..3cd6bef86
--- /dev/null
+++ b/doc/assistant/connection.png
Binary files differ
diff --git a/doc/assistant/release_notes.mdwn b/doc/assistant/release_notes.mdwn
index 13b7c62ab..1ed622ba3 100644
--- a/doc/assistant/release_notes.mdwn
+++ b/doc/assistant/release_notes.mdwn
@@ -1,3 +1,14 @@
+## version 5.20140411
+
+This release fixes a bug that could cause the assistant to use a *lot* of
+CPU, when monthly fscking was set up.
+
+Automatic upgrading was broken on OSX for previous versions. This has been
+fixed, but you'll need to manually upgrade to this version to get it going
+again. (Note that the fix is currently only available in the daily builds,
+not a released version.) Workaround: Remove the wget bundled inside the
+git-annex dmg.
+
## version 5.20140221
The Windows port of the assistant and webapp is now considered to be beta