Commit Graph
17505 Commits
Author SHA1 Message Date
lvotypko e9af33f970 Add tests for Node class 2013-07-31 11:26:02 +02:00
lvotypko 68612c4a5f Add tests for Project class 2013-07-31 10:04:55 +02:00
Kohsuke Kawaguchi 7e07fab467 Revert "Hotfix for test failure from d90d47d1b76ebb5d753e919afefb5d2457664da2."
This reverts commit 1a6f3dfa76.
forgot to add this file
2013-07-30 09:24:06 -07:00
Jesse Glick 1a6f3dfa76 Hotfix for test failure from d90d47d1b7. 2013-07-29 23:32:47 -04:00
Jesse Glick e5a254f5d9 Hotfix for build broken by e213456504. 2013-07-29 23:27:49 -04:00
Jesse Glick 15736c4590 Merge commit 'ec9b4f1' 2013-07-29 23:18:37 -04:00
Jesse Glick 39d4c6216a Merge commit 'ec9b4f1' into rc 2013-07-29 23:17:55 -04:00
Jesse Glick ec9b4f1186 [FIXED JENKINS-18895] Refined fix once again. 2013-07-29 23:17:22 -04:00
Kohsuke Kawaguchi bf68530857 the trunk is toward 1.527-SNAPSHOT 2013-07-29 19:38:10 -07:00
Kohsuke Kawaguchi 7cce853971 creating an RC branch 2013-07-29 19:38:05 -07:00
Kohsuke Kawaguchi 99c98f36ad Merge branch 'master' of github.com:jenkinsci/jenkins 2013-07-29 19:34:15 -07:00
Kohsuke Kawaguchi 4f1693d1d8 merged back the RC branch
Conflicts:
	changelog.html
2013-07-29 19:33:41 -07:00
Kohsuke Kawaguchi d90d47d1b7 [FIXED JENKINS-18289]
The code is smart enough to compute a minimum set of builds to remove to
restore order consistency.
2013-07-29 18:39:58 -07:00
Kohsuke Kawaguchi a98215426a Jenkins 2013-07-29 18:39:16 -07:00
Kohsuke Kawaguchi 1580490220 figure out a list of builds to correct to get the ordering back 2013-07-29 18:39:16 -07:00
Olivier Lamy 0c6ab8491b Merge pull request #886 from MarkEWaite/javadoc-fixes-g
Fix javadoc warnings in hudson.model.Queue
2013-07-29 17:22:25 -07:00
Jesse Glick 8d46aa6d97 [JENKINS-18895] Refined fix to not cache status during the build. 2013-07-29 18:01:25 -04:00
Jesse Glick d1d524863c [FIXED JENKINS-18895] MavenModuleSetBuild.getResult is expensive. 2013-07-29 16:06:18 -04:00
Kohsuke Kawaguchi 83039db1fc Merge branch 'master' of github.com:jenkinsci/jenkins 2013-07-29 12:48:08 -07:00
Kohsuke Kawaguchi 04ba3dfa97 updated changelog as a part of the release 2013-07-29 12:48:05 -07:00
Jesse Glick 1f23168c27 Merge branch 'master' of github.com:jenkinsci/jenkins 2013-07-29 15:00:38 -04:00
Jesse Glick ecf3d2bdc7 Unused imports. 2013-07-29 14:57:42 -04:00
Kohsuke Kawaguchi 72d847d0bd updated changelog for release 2013-07-29 11:36:14 -07:00
Kohsuke Kawaguchi c61fecd610 [maven-release-plugin] prepare for next development iteration 2013-07-29 11:27:49 -07:00
Kohsuke Kawaguchi 755a90d609 [maven-release-plugin] prepare release jenkins-1.525 jenkins-1.525 2013-07-29 11:27:48 -07:00
Kohsuke Kawaguchi e213456504 Completed JSR-250 license information 2013-07-29 10:56:54 -07:00
Kohsuke Kawaguchi d7dc26ae28 Merge remote-tracking branch 'origin/master' 2013-07-29 10:46:57 -07:00
Kohsuke Kawaguchi 0cbae2c0cf the trunk is toward 1.526-SNAPSHOT 2013-07-29 10:44:39 -07:00
Kohsuke Kawaguchi 08f4210764 creating an RC branch 2013-07-29 10:44:34 -07:00
Kohsuke Kawaguchi 26c845c968 Merge branch 'master' of github.com:jenkinsci/jenkins 2013-07-29 10:41:54 -07:00
Jesse Glick d5eb4a7182 testBasicWorkflow is just not reliable, it seems. 2013-07-29 13:31:58 -04:00
Mark Waite 112b456f6d Fix javadoc warnings in hudson.model.Queue 2013-07-29 10:04:34 -06:00
Jesse Glick 7f435c3378 Typo. 2013-07-29 11:53:26 -04:00
Jesse Glick aae1dc3164 [FIXED JENKINS-18119] More compatible fix: make ts_refresh work again. 2013-07-29 10:49:13 -04:00
Jesse Glick 2cbaf869a6 Oops, ${java.version} is a system property; switching back to ${java.level}. 2013-07-29 09:56:47 -04:00
Jesse Glick 47eec42c9d Merge branch 'master' into ArtifactManager-JENKINS-17236 2013-07-28 18:24:17 -04:00
Jesse Glick 31f216253a Merge commit '079ec15' 2013-07-28 18:21:33 -04:00
Jesse Glick 079ec15af2 Partly reverting f83d455 as it caused a verify error when running builds. 2013-07-28 18:21:17 -04:00
Jesse Glick 5cba0b9ab6 Untested integration of ArtifactManager into Maven plugin. 2013-07-28 17:58:30 -04:00
Jesse Glick 7a55fd7a76 Behavioral clarifications. 2013-07-28 17:57:15 -04:00
Jesse Glick f0eb121d32 Apparently unused method. 2013-07-28 17:30:35 -04:00
Jesse Glick 652ecdd2dc More comfortable signature for _throw. 2013-07-28 16:10:52 -04:00
Jesse Glick 18331959c7 Unused import. 2013-07-28 16:03:26 -04:00
Jesse Glick cd77e38c08 Merge branch 'master' into ArtifactManager-JENKINS-17236
Conflicts:
	core/src/main/java/hudson/model/Run.java
2013-07-28 16:00:50 -04:00
Olivier Lamy 246d351913 use last sisu version 2013-07-28 15:54:28 +10:00
ssogabe 26f913baaa make sure to close writer 2013-07-28 01:28:44 +09:00
Vincent Latombe 93606d438d Display the full display name in title for jobs and views
Following kohsuke' s review, keeping the item name at the beginning,
displaying parent's full display name after between brackets
2013-07-27 14:54:04 +02:00
ssogabe e4ea2fa75c fixed Compilation failure 2013-07-27 17:06:36 +09:00
Kohsuke Kawaguchi 397c63b2ff Merge branch 'pull-761'
Conflicts:
	test/src/test/java/hudson/model/QueueTest.java
2013-07-26 21:42:57 -07:00
Kohsuke Kawaguchi e8c663e246 Merge branch 'pull-827' 2013-07-26 21:32:43 -07:00