Merge branch 'master' of ssh://git-annex.branchable.com

5 files changed, 68 insertions, 0 deletions

diff --git a/doc/bugs/SSL_repos_does_not_show_up_in_Assistant.mdwn b/doc/bugs/SSL_repos_does_not_show_up_in_Assistant.mdwn
new file mode 100644
index 000000000..6f21cb534
--- /dev/null
+++ b/doc/bugs/SSL_repos_does_not_show_up_in_Assistant.mdwn
@@ -0,0 +1,27 @@
+### Please describe the problem.
+
+I have recently switched to self hosted git. Gitbucket over SSL. When I swithced origin from rsync ssh to ssl url assistant stopped showing origin in the repositories list it also does not sync to it when a file changes. (It does sync to it every 5 6 hours.). Running sync on the command line does sync to the repo. Authentication is done using netrc file. Replacing the ssl based url to ssh based url, repo shows up in the list and assistant syncs to it.
+
+
+### What steps will reproduce the problem?
+
+Replacing the ssh url with ssl url.
+
+
+### What version of git-annex are you using? On what operating system?
+
+5.20150823-geb17375
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+
+# End of transcript or log.
+"""]]
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+
+
diff --git a/doc/news/version_5.20150930/comment_1_f77fe435289343ae0511ffceade23ba7._comment b/doc/news/version_5.20150930/comment_1_f77fe435289343ae0511ffceade23ba7._comment
new file mode 100644
index 000000000..dd0db2260
--- /dev/null
+++ b/doc/news/version_5.20150930/comment_1_f77fe435289343ae0511ffceade23ba7._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="jephte.clain@f0da2444b164953b596ac5e3e38da30b8c04e5e3"
+ nickname="jephte.clain"
+ subject="thanks"
+ date="2015-10-01T04:25:02Z"
+ content="""
+hello,
+
+thanks, this version works on debian squeeze lts, unlike the previous. this is very good news, and a fine piece of software!
+
+I wonder: why do you depend on a minimum kernel version? for example, I have a NAS with a very old 2.6.16 embedded linux kernel which cannot be updated, and because of this, I'm stuck with an ancient git-annex version.
+
+"""]]
diff --git a/doc/news/version_5.20150930/comment_2_77faf81efaffb2637cfa0caba1758768._comment b/doc/news/version_5.20150930/comment_2_77faf81efaffb2637cfa0caba1758768._comment
new file mode 100644
index 000000000..d4a4bd111
--- /dev/null
+++ b/doc/news/version_5.20150930/comment_2_77faf81efaffb2637cfa0caba1758768._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="jephte.clain@f0da2444b164953b596ac5e3e38da30b8c04e5e3"
+ nickname="jephte.clain"
+ subject="it does not work with debian squeeze lts"
+ date="2015-10-01T12:13:11Z"
+ content="""
+hmmm... nope, it still does not work on debian squeeze lts with kernel 2.6.32-5-amd64 (when I tested earlier, I was using a more recent kernel...)
+"""]]
diff --git a/doc/news/version_5.20150930/comment_3_1cd9afc5c56781844fbff908c910056b._comment b/doc/news/version_5.20150930/comment_3_1cd9afc5c56781844fbff908c910056b._comment
new file mode 100644
index 000000000..8a974ad11
--- /dev/null
+++ b/doc/news/version_5.20150930/comment_3_1cd9afc5c56781844fbff908c910056b._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ subject="comment 3"
+ date="2015-10-01T20:14:48Z"
+ content="""
+There's an \"ancient kernels\" build you can use on those old systems.
+"""]]
diff --git a/doc/todo/xmpp_removal/comment_1_457f98a4354ad6c17dcfb5eeefb4b11e._comment b/doc/todo/xmpp_removal/comment_1_457f98a4354ad6c17dcfb5eeefb4b11e._comment
new file mode 100644
index 000000000..6f67d3da8
--- /dev/null
+++ b/doc/todo/xmpp_removal/comment_1_457f98a4354ad6c17dcfb5eeefb4b11e._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="dxld@02c834b220f9ffc0410d37263aa29d9373cc455b"
+ nickname="dxld"
+ subject="Fully p2p alternative to XMPP"
+ date="2015-10-01T17:22:44Z"
+ content="""
+It looks like no one else has suggested this yet so I guess I'll have to: [Tox](https://tox.chat/)
+
+Tox is pretty easy to build on all platforms (GNU/Linux, Mac and WinDOS). All the protocol relevant bits are implemented as a single C library (libtoxcore). It supports bulk file transfers and handles all the NAT hole punching nastiness internally AFAIK.
+
+Thoughts?
+
+"""]]