aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-25 02:50:48 (EST)
committerWinston Prakash2011-12-01 20:47:34 (EST)
commit9d939fa1d13c81ab59f6e5174e5283201f7f5810 (patch)
treec4efe670918495e49b6c28eeb511eb728d5d2193
parent3dfe1bd15a791317291f81eb9b5e989670c31257 (diff)
downloadorg.eclipse.hudson.core-9d939fa1d13c81ab59f6e5174e5283201f7f5810.zip
org.eclipse.hudson.core-9d939fa1d13c81ab59f6e5174e5283201f7f5810.tar.gz
org.eclipse.hudson.core-9d939fa1d13c81ab59f6e5174e5283201f7f5810.tar.bz2
Improved help message for "Project Relationship" search feature (HUDSON-9068).
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help.jelly7
-rw-r--r--hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help.properties9
-rw-r--r--hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help_ru.properties7
3 files changed, 16 insertions, 7 deletions
diff --git a/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help.jelly b/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help.jelly
index 7e1f69b..01ba8e8 100644
--- a/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help.jelly
+++ b/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help.jelly
@@ -1,6 +1,6 @@
<!-- **************************************************************************
#
-# Copyright (c) 2004-2009 Oracle Corporation.
+# Copyright (c) 2004-2011 Oracle Corporation.
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
#
# Contributors:
#
-# Kohsuke Kawaguchi, id:cactusman
+# Kohsuke Kawaguchi, id:cactusman, Anton Kozak
#
#
#************************************************************************** -->
@@ -33,6 +33,9 @@
<p>
${%This allows Hudson to correlate two projects.}
</p>
+ <p>
+ ${%Upstream note}
+ </p>
</l:main-panel>
</l:layout>
</j:jelly>
diff --git a/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help.properties b/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help.properties
index d701906..9bd7b05 100644
--- a/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help.properties
+++ b/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help.properties
@@ -1,6 +1,6 @@
#**************************************************************************
#
-# Copyright (c) 2004-2009 Oracle Corporation
+# Copyright (c) 2004-2011 Oracle Corporation
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
#
# Contributors:
#
-# Kohsuke Kawaguchi, id:cactusman
+# Kohsuke Kawaguchi, id:cactusman, Anton Kozak
#
#
#**************************************************************************
@@ -19,4 +19,7 @@ body=\
When you have projects that depend on each other, Hudson can track which build of \
the upstream project is used by which build of the downstream project, by using \
the records created by \
- <a href="http://hudson-ci.org/fingerprint.html">the fingerprint support</a>.
+ <a href="http://wiki.hudson-ci.org/display/HUDSON/Fingerprint">the fingerprint support</a>.
+
+Upstream\ note=Note: "upstream project" is the project which created the fingerprints, it may not be the upstream project as specified on a projects configuration page. \
+ It is possible to ignore the fingerprint ownership by specifying hudson.upstreamCulprits=true system variable, the details are available <a href="http://wiki.hudson-ci.org/display/HUDSON/Features+controlled+by+system+properties">here</a>.
diff --git a/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help_ru.properties b/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help_ru.properties
index 7dce2f7..5d1e18c 100644
--- a/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help_ru.properties
+++ b/hudson-core/src/main/resources/hudson/model/Hudson/projectRelationship-help_ru.properties
@@ -1,6 +1,6 @@
#**************************************************************************
#
-# Copyright (c) 2004-2009 Oracle Corporation
+# Copyright (c) 2004-2011 Oracle Corporation
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
#
# Contributors:
#
-# Kohsuke Kawaguchi, Mike Salnikov
+# Kohsuke Kawaguchi, Mike Salnikov, Anton Kozak
#
#
#**************************************************************************
@@ -23,3 +23,6 @@ body=\
\u041a\u043e\u0433\u0434\u0430 \u0443 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u043f\u0440\u043e\u0435\u043a\u0442\u044b, \u043e\u0434\u0438\u043d \u0438\u0437 \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0437\u0430\u0432\u0438\u0441\u0438\u0442 \u043e\u0442 \u0434\u0440\u0443\u0433\u043e\u0433\u043e, Hudson \u043c\u043e\u0436\u0435\u0442 \u043e\u0442\u0441\u043b\u0435\u0436\u0438\u0432\u0430\u0442\u044c, \
\u043a\u0430\u043a\u0430\u044f \u0441\u0431\u043e\u0440\u043a\u0430 \u0432\u043e\u0441\u0445\u043e\u0434\u044f\u0449\u0435\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0430 \u0432 \u043a\u0430\u043a\u043e\u0439 \u0441\u0431\u043e\u0440\u043a\u0435 \u043d\u0438\u0441\u0445\u043e\u0434\u044f\u0449\u0435\u0433\u043e, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044f \
\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 <a href="http://hudson-ci.org/fingerprint.html"> \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u043a\u043e\u0432</a>.
+
+Upstream\ note=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435: "\u0412\u043e\u0441\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u043f\u0440\u043e\u0435\u043a\u0442" \u044d\u0442\u043e \u043f\u0440\u043e\u0435\u043a\u0442, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0441\u043e\u0437\u0434\u0430\u043b \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u043a\u0438, \u044d\u0442\u043e \u043d\u0435 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u044b\u0439 \u043d\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0439 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 \u0432\u043e\u0441\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u043f\u0440\u043e\u0435\u043a\u0442. \
+\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0430 \u043e\u0442\u043f\u0435\u0447\u0430\u0442\u043a\u043e\u0432 \u0435\u0441\u043b\u0438 \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0443\u044e \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0443\u044e hudson.upstreamCulprits=true, \u0434\u0435\u0442\u0430\u043b\u0438 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b <a href="http://wiki.hudson-ci.org/display/HUDSON/Features+controlled+by+system+properties">\u0442\u0443\u0442</a>.