Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
0c991dec
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0c991dec
编写于
1月 10, 2017
作者:
O
Oleg Nenashev
提交者:
GitHub
1月 10, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2682 from samrocketman/enhance-slave-protocol-descriptions
[JENKINS-40700] Enhance slave protocol descriptions
上级
8820a55d
995da42d
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
28 addition
and
16 deletion
+28
-16
core/src/main/resources/hudson/cli/CliProtocol/description.jelly
...c/main/resources/hudson/cli/CliProtocol/description.jelly
+1
-1
core/src/main/resources/hudson/cli/CliProtocol/description.properties
...n/resources/hudson/cli/CliProtocol/description.properties
+1
-0
core/src/main/resources/hudson/cli/CliProtocol2/description.jelly
.../main/resources/hudson/cli/CliProtocol2/description.jelly
+1
-1
core/src/main/resources/hudson/cli/CliProtocol2/description.properties
.../resources/hudson/cli/CliProtocol2/description.properties
+1
-0
core/src/main/resources/hudson/cli/Messages.properties
core/src/main/resources/hudson/cli/Messages.properties
+2
-2
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.jelly
...s/jenkins/slaves/JnlpSlaveAgentProtocol/description.jelly
+1
-1
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.properties
...kins/slaves/JnlpSlaveAgentProtocol/description.properties
+2
-0
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description_sr.properties
...s/slaves/JnlpSlaveAgentProtocol/description_sr.properties
+1
-1
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description.jelly
.../jenkins/slaves/JnlpSlaveAgentProtocol2/description.jelly
+1
-1
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description.properties
...ins/slaves/JnlpSlaveAgentProtocol2/description.properties
+3
-0
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description_sr.properties
.../slaves/JnlpSlaveAgentProtocol2/description_sr.properties
+1
-1
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description.jelly
.../jenkins/slaves/JnlpSlaveAgentProtocol3/description.jelly
+1
-1
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description.properties
...ins/slaves/JnlpSlaveAgentProtocol3/description.properties
+4
-0
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description_sr.properties
.../slaves/JnlpSlaveAgentProtocol3/description_sr.properties
+2
-2
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol4/description.jelly
.../jenkins/slaves/JnlpSlaveAgentProtocol4/description.jelly
+1
-1
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol4/description.properties
...ins/slaves/JnlpSlaveAgentProtocol4/description.properties
+1
-0
core/src/main/resources/jenkins/slaves/Messages.properties
core/src/main/resources/jenkins/slaves/Messages.properties
+4
-4
未找到文件。
core/src/main/resources/hudson/cli/CliProtocol/description.jelly
浏览文件 @
0c991dec
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%
Accepts connections from CLI clients
}
${%
summary
}
</j:jelly>
core/src/main/resources/hudson/cli/CliProtocol/description.properties
0 → 100644
浏览文件 @
0c991dec
summary
=
Accepts connections from CLI clients. This protocol is unencrypted.
\ No newline at end of file
core/src/main/resources/hudson/cli/CliProtocol2/description.jelly
浏览文件 @
0c991dec
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%
Extends the version 1 protocol by adding transport encryption
}
${%
summary
}
</j:jelly>
core/src/main/resources/hudson/cli/CliProtocol2/description.properties
0 → 100644
浏览文件 @
0c991dec
summary
=
Extends the version 1 protocol by adding transport encryption.
core/src/main/resources/hudson/cli/Messages.properties
浏览文件 @
0c991dec
...
...
@@ -94,5 +94,5 @@ OfflineNodeCommand.ShortDescription=Stop using a node for performing builds temp
WaitNodeOnlineCommand.ShortDescription
=
Wait for a node to become online.
WaitNodeOfflineCommand.ShortDescription
=
Wait for a node to become offline.
CliProtocol.displayName
=
Jenkins CLI Protocol/1
CliProtocol2.displayName
=
Jenkins CLI Protocol/2
CliProtocol.displayName
=
Jenkins CLI Protocol/1
(unencrypted)
CliProtocol2.displayName
=
Jenkins CLI Protocol/2
(transport encryption)
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.jelly
浏览文件 @
0c991dec
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%
Accepts connections from remote clients so that they can be used as additional build agents
}
${%
summary
}
</j:jelly>
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.properties
0 → 100644
浏览文件 @
0c991dec
summary
=
Accepts connections from remote clients so that they can be used as additional build agents.
\
This protocol is unencrypted.
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description_sr.properties
浏览文件 @
0c991dec
# This file is under the MIT License by authors
Accepts\
connections\
from\
remote\
clients\
so\
that\
they\
can\
be\
used\
as\
additional\
build\
agents
=
\u
041F
\u0440\u0438\u0445\u0432\u0430\u0442\u0430
\u0432\u0435\u0437\u0435
\u
043E
\u0434
\u
043A
\u
043B
\u0438\u0458\u0435\u
043D
\u0442\u0438\u
043C
\u0430
\u0434\u0430
\u0431\u0438
\u
043C
\u
043E
\u0433\u
043B
\u0438
\u0441\u0435
\u0443\u
043F
\u
043E
\u0442\u0440\u0435\u0431\u0438\u0442\u0438
\u
043A
\u0430\u
043E
\u0434\u
043E
\u0434\u0430\u0442\u
043D
\u0435
\u0430\u0433\u0435\u
043D
\u0442\u0435
\u0437\u0430
\u0438\u0437\u0433\u0440\u0430\u0434\u
045A
\u0443
.
summary
=
\u
041f
\u0440\u0438\u0445\u0432\u0430\u0442\u0430
\u0432\u0435\u0437\u0435
\u
043e
\u0434
\u
043a
\u
043b
\u0438\u0458\u0435\u
043d
\u0442\u0438\u
043c
\u0430
\u0434\u0430
\u0431\u0438
\u
043c
\u
043e
\u0433\u
043b
\u0438
\u0441\u0435
\u0443\u
043f
\u
043e
\u0442\u0440\u0435\u0431\u0438\u0442\u0438
\u
043a
\u0430\u
043e
\u0434\u
043e
\u0434\u0430\u0442\u
043d
\u0435
\u0430\u0433\u0435\u
043d
\u0442\u0435
\u0437\u0430
\u0438\u0437\u0433\u0440\u0430\u0434\u
045a
\u0443
.
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description.jelly
浏览文件 @
0c991dec
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%
Extends the version 1 protocol by adding a per-client cookie, so that we can detect a reconnection from the agent and take appropriate action
}
${%
summary
}
</j:jelly>
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description.properties
0 → 100644
浏览文件 @
0c991dec
summary
=
Extends the version 1 protocol by adding a per-client cookie,
\
so that we can detect a reconnection from the agent and take appropriate action.
\
This protocol is unencrypted.
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description_sr.properties
浏览文件 @
0c991dec
# This file is under the MIT License by authors
Extends\
the\
version\
1\
protocol\
by\
adding\
a\
per-client\
cookie,\
so\
that\
we\
can\
detect\
a\
reconnection\
from\
the\
agent\
and\
take\
appropriate\
action
=
\u
041D
\u0430\u0434\u0433\u0440\u0430\u0452\u0443\u0458\u0435
\u0432\u0435\u0440\u0437\u0438\u0458\u0443
1
\u
043F
\u0440\u
043E
\u0442\u
043E
\u
043A
\u
043E
\u
043B
\u0430
\u0434\u
043E
\u0434\u0430\u0432\u0430\u
045B
\u0438
cookie
\u0441\u0432\u0430\u
043A
\u
043E
\u
043C
\u
043A
\u
043B
\u0438\u0458\u0435\u
043D
\u0442\u0443
,
\u0448\u0442\u
043E
\u
043E
\u
043C
\u
043E
\u0433\u0443\u0458\u0443\u
045B
\u0435
\u
043F
\u
043E
\u
043D
\u
043E
\u0432\u
043E
\u
043F
\u
043E
\u0432\u0435\u0437\u0438\u0432\u0430\u
045A
\u0435
\u0441\u0430
\u0430\u0433\u0435\u
043D
\u0442\u
043E
\u
043C
.
summary
=
\u
041d
\u0430\u0434\u0433\u0440\u0430\u0452\u0443\u0458\u0435
\u0432\u0435\u0440\u0437\u0438\u0458\u0443
1
\u
043f
\u0440\u
043e
\u0442\u
043e
\u
043a
\u
043e
\u
043b
\u0430
\u0434\u
043e
\u0434\u0430\u0432\u0430\u
045b
\u0438
cookie
\u0441\u0432\u0430\u
043a
\u
043e
\u
043c
\u
043a
\u
043b
\u0438\u0458\u0435\u
043d
\u0442\u0443
,
\u0448\u0442\u
043e
\u
043e
\u
043c
\u
043e
\u0433\u0443\u0458\u0443\u
045b
\u0435
\u
043f
\u
043e
\u
043d
\u
043e
\u0432\u
043e
\u
043f
\u
043e
\u0432\u0435\u0437\u0438\u0432\u0430\u
045a
\u0435
\u0441\u0430
\u0430\u0433\u0435\u
043d
\u0442\u
043e
\u
043c
.
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description.jelly
浏览文件 @
0c991dec
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%
Extends the version 2 protocol by adding basic encryption but requires a thread per client
}
${%
summary
}
</j:jelly>
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description.properties
0 → 100644
浏览文件 @
0c991dec
summary
=
Extends the version 2 protocol by adding basic encryption but requires a thread per client.
\
This protocol falls back to Java Web Start Agent Protocol/2 (unencrypted) when it can't create a secure connection.
\
This protocol is not recommended.
\
Use Java Web Start Agent Protocol/4 instead.
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description_sr.properties
浏览文件 @
0c991dec
# This file is under the MIT License by authors
Extends\
the\
version\
2\
protocol\
by\
adding\
basic\
encryption\
but\
requires\
a\
thread\
per\
client
=
\u
041D
\u0430\u0434\u0433\u0440\u0430\u0452\u0443\u0458\u0435
\u0432\u0435\u0440\u0437\u0438\u0458\u0443
2
\u
043F
\u0440\u
043E
\u0442\u
043E
\u
043A
\u
043E
\u
043B
\u0430
\u0434\u
043E
\u0434\u0430\u0432\u0430\u0458\u0443\u
045B
\u0438
\u0448\u0438\u0444\u0440\u
043E
\u0432\u0430\u
045A
\u0435
(
\u
043F
\u
043E
\u0442\u0440\u0435\u0431\u
043D
\u
043E
\u0458\u0435\u0434\u0430\u
043D
\u
043D
\u0438\u0437
\u0437\u0430
\u0441\u0432\u0430\u
043A
\u
043E
\u0433
\u
043A
\u
043B
\u0438\u0458\u0435\u
043D
\u0442\u0430
)
#TODO: Summary is outdated, needs to be modified
summary
=
\u
041d
\u0430\u0434\u0433\u0440\u0430\u0452\u0443\u0458\u0435
\u0432\u0435\u0440\u0437\u0438\u0458\u0443
2
\u
043f
\u0440\u
043e
\u0442\u
043e
\u
043a
\u
043e
\u
043b
\u0430
\u0434\u
043e
\u0434\u0430\u0432\u0430\u0458\u0443\u
045b
\u0438
\u0448\u0438\u0444\u0440\u
043e
\u0432\u0430\u
045a
\u0435
(
\u
043f
\u
043e
\u0442\u0440\u0435\u0431\u
043d
\u
043e
\u0458\u0435\u0434\u0430\u
043d
\u
043d
\u0438\u0437
\u0437\u0430
\u0441\u0432\u0430\u
043a
\u
043e
\u0433
\u
043a
\u
043b
\u0438\u0458\u0435\u
043d
\u0442\u0430
)
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol4/description.jelly
浏览文件 @
0c991dec
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%
A TLS secured connection between the master and the agent performed by TLS upgrade of the socket.
}
${%
summary
}
</j:jelly>
core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol4/description.properties
0 → 100644
浏览文件 @
0c991dec
summary
=
A TLS secured connection between the master and the agent performed by TLS upgrade of the socket.
core/src/main/resources/jenkins/slaves/Messages.properties
浏览文件 @
0c991dec
...
...
@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
JnlpSlaveAgentProtocol.displayName
=
Java Web Start Agent Protocol/1
JnlpSlaveAgentProtocol2.displayName
=
Java Web Start Agent Protocol/2
JnlpSlaveAgentProtocol3.displayName
=
Java Web Start Agent Protocol/3
JnlpSlaveAgentProtocol4.displayName
=
Java Web Start Agent Protocol/4
JnlpSlaveAgentProtocol.displayName
=
Java Web Start Agent Protocol/1
(unencrypted)
JnlpSlaveAgentProtocol2.displayName
=
Java Web Start Agent Protocol/2
(unencrypted)
JnlpSlaveAgentProtocol3.displayName
=
Java Web Start Agent Protocol/3
(basic encryption)
JnlpSlaveAgentProtocol4.displayName
=
Java Web Start Agent Protocol/4
(TLS encryption)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录