diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-26 19:01:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-26 19:01:09 -0400 |
| commit | 8384d8a898958b8b69f4047594ddc5fd0158fe34 (patch) | |
| tree | 903ab13fe2522b586df54d31934853c9048f578b | |
| parent | 051381badc632649db4f37618fbd79292f0b92f5 (diff) | |
| parent | 3f24e696e6b63989156627fe5cadba9f43ae7280 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/bugs/cabal_configure_is_broken_on_OSX_builds.mdwn | 12 | ||||
| -rw-r--r-- | doc/design/assistant/polls/prioritizing_special_remotes.mdwn | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/bugs/cabal_configure_is_broken_on_OSX_builds.mdwn b/doc/bugs/cabal_configure_is_broken_on_OSX_builds.mdwn new file mode 100644 index 000000000..e31b9a789 --- /dev/null +++ b/doc/bugs/cabal_configure_is_broken_on_OSX_builds.mdwn @@ -0,0 +1,12 @@ +Seems the last few commits have borked 'cabal configure' on OSX with the following error message + +<pre> +[jtang@laplace git-annex (master)]$ cabal configure +Resolving dependencies... + +Build/InstallDesktopFile.hs:19:8: + Could not find module `Assistant.OSX' + Use -v to see a list of the files searched for. +</pre> + +Looks like a missing module. diff --git a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn index 88c5edef1..5462e7139 100644 --- a/doc/design/assistant/polls/prioritizing_special_remotes.mdwn +++ b/doc/design/assistant/polls/prioritizing_special_remotes.mdwn @@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync. Help me prioritize my work: What special remote would you most like to use with the git-annex assistant? -[[!poll open=yes 14 "Amazon S3 (done)" 8 "Amazon Glacier" 6 "Box.com" 44 "My phone (or MP3 player)" 6 "Tahoe-LAFS" 3 "OpenStack SWIFT" 12 "Google Drive"]] +[[!poll open=yes 14 "Amazon S3 (done)" 8 "Amazon Glacier" 6 "Box.com" 46 "My phone (or MP3 player)" 6 "Tahoe-LAFS" 3 "OpenStack SWIFT" 12 "Google Drive"]] This poll is ordered with the options I consider easiest to build listed first. Mostly because git-annex already supports them and they |