kohsuke 3b7eb05e43 merged the RC branch back. This time I saw a lot of strange merge failures. Is svnmerge interfering with Subversion 1.6 somehow? ...

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19665 71c3de6d-444a-0410-be80-ed276b4c234a

2009-07-13 17:48:59 +00:00

..

src/main

I discovered that when Apache sits in front of Hudson as a reverse proxy, it blocks the traffic in such a way that breaks tunneling of the remoting.

2009-07-03 00:12:46 +00:00

pom.xml

merged the RC branch back. This time I saw a lot of strange merge failures. Is svnmerge interfering with Subversion 1.6 somehow?

2009-07-13 17:48:59 +00:00