Jesse Glick
6739d35253
Merge branch 'security' into security-stable-1.596
...
Conflicts:
pom.xml
2015-02-27 14:26:19 -05:00
Jesse Glick
fe6b2dccf3
Merge branch 'security' into security-stable-1.580
...
Conflicts:
pom.xml
2015-02-27 14:25:07 -05:00
Jesse Glick
05ebd4ea03
matrix-project 1.2.1
2015-02-27 14:14:45 -05:00
Jesse Glick
f60bde00ab
Merge branch 'security' into security-rc
...
Conflicts:
core/src/main/java/hudson/PluginManager.java
core/src/test/java/hudson/PluginManagerTest.java
2015-02-27 13:50:21 -05:00
Jesse Glick
8f84890923
Merge branch 'rc' into security-rc
2015-02-27 13:48:15 -05:00
Jesse Glick
3c2e8171f8
Merge branch 'security' into security-stable-1.596
...
Conflicts:
core/src/main/java/hudson/PluginManager.java
core/src/test/java/hudson/PluginManagerTest.java
2015-02-27 13:46:24 -05:00
Jesse Glick
664748283e
Merge branch 'security' into security-stable-1.580
2015-02-27 13:44:12 -05:00
Kohsuke Kawaguchi
a1875a158d
Merge pull request #12 from jenkinsci-cert/SECURITY-167_3
...
[SECURITY-167] Plugin manager was also vulnerable to XXE attacks.
2015-02-27 10:34:53 -08:00
James Nord
b8c9841c30
[SECURITY-167] Plugin manager was also vulnerable.
...
Although the plugiun manager was vulnerable getting information
out of Jenkins was harder - however it would still be possible to
do bad things such as reading from /dev/zero on Linux
2015-02-27 18:18:23 +00:00
Seiji Sogabe
a452023789
Merge pull request #1587 from ssogabe/japanese
...
update Japanese localization
2015-02-27 17:11:11 +09:00
Seiji Sogabe
c35d2a68be
update japanese localization
2015-02-27 16:17:18 +09:00
Jesse Glick
db1f805d68
[FIXED JENKINS-26690] Integer overflow in AbstractLazyLoadRunMap.headMap with negative arguments.
2015-02-26 18:10:50 -05:00
Oliver Gondža
3e920a903d
Merge pull request #1585 from sylvestre/master
...
Fix a display issue with the French locale
2015-02-26 14:07:43 +01:00
Sylvestre Ledru
a6d26dcc22
Fix a display issue with the French locale by using the french word (show '&')
2015-02-26 14:01:58 +01:00
Baptiste Mille-Mathias
faef34c942
Spotted a HUDSON variable
...
rename a commented HUDSON_LOG to JENKINS_LOG
2015-02-26 08:24:21 +01:00
christ66
d8f6187141
Add a unit test to verify assigned labels with spaces. Reduce duplicate code in test unit when validating cloud labels.
2015-02-25 13:57:50 -08:00
Oliver Gondža
9bb90f8ea6
Merge pull request #1583 from hayderimran7/master
...
add readme.md file for opensuse install
2015-02-24 19:03:57 +01:00
hayderimran7
0f33a3881f
remove readme.html in favor of README.md
2015-02-24 09:41:51 -08:00
tfennelly
a89e53ff61
Noting 27096
2015-02-24 08:23:28 +00:00
tfennelly
d81c300c5a
Added @since to some new id related fields/methods in Queue.Item and Run
2015-02-24 08:08:39 +00:00
hayderimran7
cccf34b974
add readme.md file for opensuse install
2015-02-24 00:08:08 -08:00
tfennelly
bd31bde3c3
Fix Queue.Item.id and Run.getQueueId javadoc
2015-02-24 08:01:44 +00:00
Jesse Glick
c8abbfc972
Merge pull request #1572 from ikedam/feature/JENKINS-4409_DisableURLConnectionCache
...
[JENKINS-4409] Disable URLConnection.useCache in tests on Windows
2015-02-23 12:06:26 -05:00
Jesse Glick
f918dd84ac
Merge pull request #1579 from jglick/ArtifactArchiver.allowEmptyArchive-NPE-JENKINS-25779
...
NPE from ArtifactArchiver.getAllowEmptyArchive
2015-02-23 07:47:38 -05:00
Jesse Glick
0d8ebb17c2
[JENKINS-25779] Fix an NPE when ArtifactArchiver.setAllowEmptyArchive is not explicitly called.
2015-02-22 16:26:23 -05:00
Jesse Glick
9f6be6306e
Merge branch 'master' of git://github.com/jenkinsci/jenkins
builds/350
changes/350
2015-02-22 16:18:37 -05:00
Tom Fennelly
e88bf5694b
Merge pull request #1566 from tfennelly/JENKINS-26445
...
Permanently valid Queue.Item.id
2015-02-20 15:06:12 +00:00
tfennelly
89681c2029
Mapping of Queue.Item.id onto Run instance
...
Allowing correlation/tracking all the way through the lifecycle
2015-02-20 10:32:42 +00:00
Jesse Glick
61091c1400
Suggested additions now all filed in JIRA and linked to JENKINS-20999 for tracking.
2015-02-19 09:45:01 -05:00
christ66
17527fbcfc
Make matches(String) method private. Change parameter variable name to prevent confusion. Add extra javadoc.
2015-02-18 16:30:10 -08:00
christ66
21b7863904
Add a test unit which tests a cloud label with a complex project label expression. Created a helper method to verify a label name and weight are part of a TagCloud.
2015-02-18 03:57:09 -08:00
christ66
6c30cad59c
Create Label.matches(String) which verifies a labels name are equal.
2015-02-18 03:54:50 -08:00
christ66
2e8bcc9240
Make hashCode and compareTo methods final since equals is marked final.
2015-02-18 01:18:13 -08:00
christ66
a45de88631
Implementations of Label should not override the equals method and should be constructed by the LabelExpressionParser.
2015-02-17 12:04:41 -08:00
christ66
82e5c8136e
Add several test units for Labels in more complex scenarios.
2015-02-16 20:01:37 -08:00
Kohsuke Kawaguchi
419d670cd0
the trunk is toward 1.601-SNAPSHOT
2015-02-16 17:18:15 -08:00
Kohsuke Kawaguchi
67b56f8829
creating an RC branch
2015-02-16 17:18:11 -08:00
Kohsuke Kawaguchi
142fe81c7a
merged back the RC branch
2015-02-16 09:36:42 -08:00
Kohsuke Kawaguchi
dda9f9201d
updated changelog as a part of the release
2015-02-16 09:36:40 -08:00
Kohsuke Kawaguchi
c49742fd81
updated changelog for release
2015-02-16 07:43:59 -08:00
Kohsuke Kawaguchi
1ef46e4a38
[maven-release-plugin] prepare for next development iteration
2015-02-16 07:36:49 -08:00
Kohsuke Kawaguchi
95ea87e7aa
[maven-release-plugin] prepare release jenkins-1.599
jenkins-1.599
2015-02-16 07:36:49 -08:00
christ66
7a2dc32cc3
[JENKINS-26391] Prevent lazy loading operation when obtaining label information.
2015-02-15 23:29:21 -08:00
Seiji Sogabe
75b9b314ec
added nowrap to avoid table layout being broken.
2015-02-15 15:24:15 +09:00
ikedam
c4e5fbdbc9
[FIXED JENKINS-4409] Disable URLConnection.useCache in tests on Windows. It prevents deleting temporary directories when tests finish.
2015-02-14 15:10:03 +09:00
Oliver Gondža
5dcdb1d525
Merge pull request #1571 from muhammedeminakbulut/muhammedeminakbulut-patch-langfix
...
some language issues fixed
2015-02-13 17:32:40 +01:00
muhammedeminakbulut
d198bfa511
some language issues fixed
2015-02-13 16:42:38 +01:00
Nicolas De Loof
5f7629bb8b
prevent removing artifact when build isn’t completed yet
2015-02-12 22:24:25 +01:00
Oliver Gondža
6c1db42830
Noting #1567
2015-02-11 12:58:56 +01:00
Oliver Gondža
66b62b9a1f
Merge pull request #1567 from olivergondza/maven-special-chars-dirty
...
[JENKINS-26684] Escape special chars in maven build step arguments
builds/348
changes/348
2015-02-11 10:05:21 +01:00