jgit/org.eclipse.jgit.ssh.apache...
Matthias Sohn 1aa3cf7f41 Merge branch 'master' into next
* master: (34 commits)
  Remove texts which were added by mistake in 00386272
  Fix formatting which was broken in 00386272
  LockFile: create OutputStream only when needed
  Add a cgit interoperability test for LockFile
  Add TemporaryBuffer.toString(int limit)
  LockFile: create OutputStream only when needed
  Prepare 5.12.0-SNAPSHOT builds
  JGit v5.12.0.202105051250-m2
  Update jetty to 9.4.40.v20210413
  [releng] Update eclipse-jarsigner-plugin to 1.3.1
  Implement ours/theirs content conflict resolution
  ssh: ensure list is modifiable before using Iterator.remove().
  Update orbit to S20210406213021 and add 4.20-staging target
  Fix typo in test method name
  Allow file mode conflicts in virtual base commit on recursive merge.
  sshd: don't lock the known_hosts files on reading
  Allow info messages in UsernamePasswordCredentialsProvider
  ssh config: do environment variable replacement
  sshd: implement server-sig-algs SSH extension (client side)
  Upgrade ecj to 3.25.0
  ...

Change-Id: Ibc39a9c4e431d15b67ab4a307241f47a7f3740a9
2021-05-12 08:59:07 +02:00
..
.settings Ignore missing javadoc tags in test bundles 2020-11-29 20:16:38 +01:00
META-INF Merge branch 'master' into next 2021-05-12 08:59:07 +02:00
tst/org/eclipse/jgit sshd: try all configured signature algorithms for a key 2021-03-19 17:28:24 +01:00
.classpath Apache MINA sshd client 2018-11-13 10:49:26 -08:00
.gitignore Apache MINA sshd client 2018-11-13 10:49:26 -08:00
.project
BUILD Decouple JSch from JGit Core 2020-06-01 01:46:59 +02:00
about.html
build.properties sshd: implement ssh config PubkeyAcceptedAlgorithms 2021-03-19 17:27:03 +01:00
plugin.properties Fix bundle localization of Apache SSH bundle 2019-06-21 17:54:06 +02:00
pom.xml Prepare 5.12.0-SNAPSHOT builds 2021-03-10 16:34:28 +01:00