diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2018-02-25 23:22:08 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2018-02-25 23:22:08 +0900 |
| commit | 2bc62f23fac4f6d7175273d951178a957ca208cb (patch) | |
| tree | aa8257ae65968549480c3637ffed462a6e610c44 | |
| parent | bc24c17195028ad20efea74c8bda3e3a50ce0839 (diff) | |
| parent | 3ca7f7af93799021727545fcd1ed31eda69a1c77 (diff) | |
Merge branch 'stable-2.11' into stable-2.12v2.12.8
* stable-2.11:
Set version to 2.11.11
Replace links to code.google.com/p/gerrit
Update issue tracker URL in documentation
Update issue tracker URL in POM files
Bump jsch to 0.54
Update jsch to 0.1.53
Bump Jsch to 1.52
Change-Id: Ie23ff4282f5b49a54f7043a4e932a4d18f2b5ef8
| -rw-r--r-- | Documentation/config-sso.txt | 2 | ||||
| -rw-r--r-- | Documentation/dev-design.txt | 2 | ||||
| -rw-r--r-- | Documentation/dev-readme.txt | 2 | ||||
| -rw-r--r-- | lib/BUCK | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/config-sso.txt b/Documentation/config-sso.txt index 561309bfaa..897ca29e17 100644 --- a/Documentation/config-sso.txt +++ b/Documentation/config-sso.txt @@ -64,7 +64,7 @@ Users wishing to link an alternative identity should *NOT* log in separately with that identity. Doing so will result in a new account being created, and subsequent attempts to link that account with the existing account will fail. In cases where this happens, the administrator will need to manually merge the -accounts. See link:https://code.google.com/p/gerrit/wiki/SqlMergeUserAccounts[ +accounts. See link:https://gerrit.googlesource.com/homepage/+/md-pages/docs/SqlMergeUserAccounts.md[ Merging Gerrit User Accounts] on the Gerrit Wiki for details. Linking another identity is also useful for users whose primary OpenID provider diff --git a/Documentation/dev-design.txt b/Documentation/dev-design.txt index 4e82507901..bdd2a68319 100644 --- a/Documentation/dev-design.txt +++ b/Documentation/dev-design.txt @@ -342,7 +342,7 @@ automate interfaces may make it impossible for non-browser agents to be used with the JSON-RPC interface. * link:http://json-rpc.org/wd/JSON-RPC-1-1-WD-20060807.html[JSON-RPC 1.1] -* link:http://code.google.com/p/gerrit/source/browse/README?repo=gwtjsonrpc&name=master[XSRF JSON-RPC] +* link:https://gerrit.googlesource.com/gwtjsonrpc/+/master/README[XSRF JSON-RPC] == Privacy Considerations diff --git a/Documentation/dev-readme.txt b/Documentation/dev-readme.txt index 4959cedc15..4a5c0bd9f2 100644 --- a/Documentation/dev-readme.txt +++ b/Documentation/dev-readme.txt @@ -221,7 +221,7 @@ the browser and on the server side. Google Web Toolkit: -* http://code.google.com/webtoolkit/download.html[Download] +* http://www.gwtproject.org/download.html[Download] Apache SSHD: @@ -80,8 +80,8 @@ maven_jar( maven_jar( name = 'jsch', - id = 'com.jcraft:jsch:0.1.53', - sha1 = '658b682d5c817b27ae795637dfec047c63d29935', + id = 'com.jcraft:jsch:0.1.54', + sha1 = 'da3584329a263616e277e15462b387addd1b208d', license = 'jsch', ) |