Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
b08e1a75
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
b08e1a75
编写于
7月 23, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:jenkinsci/jenkins
上级
33101a3a
03b1c4f5
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
8 addition
and
8 deletion
+8
-8
core/src/main/java/hudson/matrix/MatrixAggregator.java
core/src/main/java/hudson/matrix/MatrixAggregator.java
+1
-1
core/src/main/java/hudson/matrix/MatrixExecutionStrategy.java
.../src/main/java/hudson/matrix/MatrixExecutionStrategy.java
+1
-1
core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java
...src/main/java/hudson/model/queue/QueueTaskDispatcher.java
+4
-4
core/src/main/java/hudson/slaves/NodeProperty.java
core/src/main/java/hudson/slaves/NodeProperty.java
+1
-1
core/src/main/java/hudson/triggers/SCMTrigger.java
core/src/main/java/hudson/triggers/SCMTrigger.java
+1
-1
未找到文件。
core/src/main/java/hudson/matrix/MatrixAggregator.java
浏览文件 @
b08e1a75
...
...
@@ -74,7 +74,7 @@ public abstract class MatrixAggregator implements ExtensionPoint {
* @return
* true if the build can continue, false if there was an error
* and the build needs to be aborted.
* @see BuildStep#prebuild(Build,BuildListener)
* @see BuildStep#prebuild(
Abstract
Build,BuildListener)
*/
public
boolean
startBuild
()
throws
InterruptedException
,
IOException
{
return
true
;
...
...
core/src/main/java/hudson/matrix/MatrixExecutionStrategy.java
浏览文件 @
b08e1a75
...
...
@@ -47,7 +47,7 @@ public abstract class MatrixExecutionStrategy extends AbstractDescribableImpl<Ma
/**
* @deprecated
* Override {@link #run(MatrixBuildExecution)}
* Override {@link #run(MatrixBuild
.MatrixBuild
Execution)}
*/
public
Result
run
(
MatrixBuild
build
,
List
<
MatrixAggregator
>
aggregators
,
BuildListener
listener
)
throws
InterruptedException
,
IOException
{
throw
new
UnsupportedOperationException
(
getClass
()+
" needs to override run(MatrixBuildExecution)"
);
...
...
core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java
浏览文件 @
b08e1a75
...
...
@@ -64,7 +64,7 @@ public abstract class QueueTaskDispatcher implements ExtensionPoint {
* (This relationship is also the same with built-in check logic.)
*
* @deprecated since 1.413
* Use {@link #canTake(Node, BuildableItem)}
* Use {@link #canTake(Node,
Queue.
BuildableItem)}
*/
public
CauseOfBlockage
canTake
(
Node
node
,
Task
task
)
{
return
null
;
...
...
@@ -85,7 +85,7 @@ public abstract class QueueTaskDispatcher implements ExtensionPoint {
*
* <p>
* This method is primarily designed to fine-tune where the execution should take place. If the execution
* shouldn't commence anywhere at all, implementation should use {@link #canRun(Item)} instead so
* shouldn't commence anywhere at all, implementation should use {@link #canRun(
Queue.
Item)} instead so
* that Jenkins understands the difference between "this node isn't the right place for this work"
* vs "the time isn't right for this work to execute." This affects the provisioning behaviour
* with elastic Jenkins deployments.
...
...
@@ -107,9 +107,9 @@ public abstract class QueueTaskDispatcher implements ExtensionPoint {
* executor availability), or if it should be considered blocked.
*
* <p>
* Compared to {@link #canTake(Node, BuildableItem)}, this version tells Jenkins that the task is
* Compared to {@link #canTake(Node,
Queue.
BuildableItem)}, this version tells Jenkins that the task is
* simply not ready to execute, even if there's available executor. This is more efficient
* than {@link #canTake(Node, BuildableItem)}, and it sends the right signal to Jenkins so that
* than {@link #canTake(Node,
Queue.
BuildableItem)}, and it sends the right signal to Jenkins so that
* it won't use {@link Cloud} to try to provision new executors.
*
* <p>
...
...
core/src/main/java/hudson/slaves/NodeProperty.java
浏览文件 @
b08e1a75
...
...
@@ -90,7 +90,7 @@ public abstract class NodeProperty<N extends Node> implements ReconfigurableDesc
*
* @since 1.360
* @deprecated as of 1.413
* Use {@link #canTake(BuildableItem)}
* Use {@link #canTake(
Queue.
BuildableItem)}
*/
public
CauseOfBlockage
canTake
(
Task
task
)
{
return
null
;
...
...
core/src/main/java/hudson/triggers/SCMTrigger.java
浏览文件 @
b08e1a75
...
...
@@ -520,7 +520,7 @@ public class SCMTrigger extends Trigger<SCMedItem> {
/**
* @deprecated
* Use {@link #SCMTriggerCause(String)}.
* Use {@link #SCMTrigger
.SCMTrigger
Cause(String)}.
*/
public
SCMTriggerCause
()
{
this
(
""
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录