Commit Graph
3052 Commits
Author SHA1 Message Date
Daniel Beck 3624f70169 Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0
Conflicts:
	cli/pom.xml
	core/pom.xml
	pom.xml
	test/pom.xml
	test/src/test/java/hudson/cli/CreateNodeCommandTest.java
	test/src/test/java/hudson/cli/DeleteNodeCommandTest.java
	test/src/test/java/hudson/cli/GetNodeCommandTest.java
	test/src/test/java/hudson/cli/OnlineNodeCommandTest.java
	test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
	war/pom.xml
2016-02-22 13:22:37 +01:00
Kohsuke Kawaguchi d7f35274d8 [maven-release-plugin] prepare for next development iteration 2016-02-21 12:16:13 -08:00
Kohsuke Kawaguchi f5db2b933e [maven-release-plugin] prepare release jenkins-1.649 2016-02-21 12:16:12 -08:00
Oliver Gondža fe41dc89ab Merge pull request #1997 from pjanouse/JENKINS-32273
[JENKINS-32273] Unified an issue handling in CLI
2016-02-19 15:53:15 +01:00
Kohsuke Kawaguchi adfeaba43c [maven-release-plugin] prepare for next development iteration 2016-02-17 16:38:48 -08:00
Kohsuke Kawaguchi e7428a4355 [maven-release-plugin] prepare release jenkins-1.648 2016-02-17 16:38:47 -08:00
Andrew Bayer 32d65cc678 test pom.xml: Bump Surefire -Xmx
I'm seeing some GC overhead limit errors - more memory should solve that.
2016-02-16 12:02:40 -08:00
Kohsuke Kawaguchi f40f9bbbad Merge remote-tracking branch 'origin/pr/2007' into 2.0 2016-02-13 11:59:59 -06:00
Ing. Pavel Janousek d5725e6d18 [JENKINS-32273] Unified an issue handling in CLI
Re-factored all existed CLI code to follow the new proposed scheme for
raising an exception if issue occurs, handling and reporting it.
Unified CLIRegisterer as well.
Fixed unit tests to follow the new scheme.
2016-02-12 16:25:20 +01:00
Oliver Gondža 731c86ea3c Better defect localization 2016-02-11 11:37:15 +01:00
Kohsuke Kawaguchi 5afddb1ab5 Merge branch 'master' of github.com:jenkinsci/jenkins 2016-02-04 07:55:19 -08:00
Stephen Connolly 95043db718 Merge pull request #1991 from andresrc/JENKINS-32517
[JENKINS-32517] Deprecate Queue#getApproximateItemsQuickly
2016-02-04 15:08:52 +00:00
Kohsuke Kawaguchi 279027e40f [maven-release-plugin] prepare for next development iteration 2016-02-03 08:00:40 -08:00
Kohsuke Kawaguchi 0978b099cf [maven-release-plugin] prepare release jenkins-1.647 2016-02-03 08:00:39 -08:00
Antonio Muñiz f7a9d268f9 Fix tests after renaming in log messages 2016-01-29 18:56:42 +01:00
Andres Rodriguez 638ceb2316 [JENKINS-32517] Deprecate Queue#getApproximateItemsQuickly
Now that the item list is obtained lock-free the cache is no longer needed.
Besides, the cache could be returning invalid results for requests with different authorization to the one that cached the result (in any case this invalid result is transient).
2016-01-29 15:38:52 +01:00
Antonio Muñiz 317d788eff [JENKINS-27268] Fix tests after renaming 2016-01-28 18:21:06 +01:00
Daniel Beck 9cab873461 Merge branch 'master' of github.com:jenkinsci/jenkins into 2.0
Conflicts:
	cli/pom.xml
	core/pom.xml
	plugins/pom.xml
	pom.xml
	test/pom.xml
	war/pom.xml
2016-01-26 15:49:33 +01:00
tfennelly eb314511af Update test-harness version to 2.2 2016-01-25 21:28:50 +00:00
Kohsuke Kawaguchi 4a98268301 Merge branch 'master' of github.com:jenkinsci/jenkins 2016-01-25 06:44:57 -08:00
Kohsuke Kawaguchi 8ccb5757e3 [maven-release-plugin] prepare for next development iteration 2016-01-25 06:11:21 -08:00
Kohsuke Kawaguchi 437f9897a1 [maven-release-plugin] prepare release jenkins-1.646 2016-01-25 06:11:20 -08:00
valentina 7d7e8d9811 Merge pull request #1972 from varmenise/JENKINS-32328
[FIXED JENKINS-32328] process multiple update-centers for ToolInstallers
2016-01-25 13:24:16 +01:00
Valentina Armenise e7f88146ba [JENKINS-32328] handling tool Installers which do not have the default schema 2016-01-22 18:16:35 +01:00
Valentina Armenise 80a6a9e7cb [JENKINS-32328] process multiple update-centers for ToolInstallers 2016-01-22 15:17:57 +01:00
Tom Fennelly 3f91d342c9 UpdateCenterConnectionStatusTest fix for the hoards of people that have a host named "xyz" ;) 2016-01-22 11:31:46 +00:00
tfennelly 036a8e94ed [FIX JENKINS-9598] Add plugin selection wizard on first launch
Also ... unbundling of plugins from Jenkins core.
2016-01-20 10:54:32 +00:00
Oliver Gondža 1f89b5a909 Merge pull request #1992 from jglick/BuildTriggerTest.downstreamProjectShouldObserveCompletedParent
BuildTriggerTest.downstreamProjectShouldObserveCompletedParent failure
2016-01-20 08:37:10 +01:00
Jesse Glick 658f7d40b0 Random-looking failure in downstreamProjectShouldObserveCompletedParent. 2016-01-19 12:30:59 -05:00
Kohsuke Kawaguchi 75a93b4cae [maven-release-plugin] prepare for next development iteration 2016-01-18 23:32:52 -08:00
Kohsuke Kawaguchi ffa1d92141 [maven-release-plugin] prepare release jenkins-1.645 2016-01-18 23:32:52 -08:00
Daniel Beck e0919f1a46 Set version to 2.0-alpha-1-SNAPSHOT 2016-01-19 02:14:53 +01:00
Jesse Glick 92f48ca26e Use released version of test harness. 2016-01-15 15:06:19 -05:00
Jesse Glick 749346896a Split of test harness into separate artifact. 2016-01-13 18:14:37 -05:00
Jesse Glick 8cfa1e890f Merge pull request #1950 from jglick/WebAppMain.contextDestroyed-logging
[JENKINS-24696] WebAppMain.contextDestroyed produces weird errors
2016-01-11 10:37:26 -05:00
Kohsuke Kawaguchi 8c0dd2c116 [maven-release-plugin] prepare for next development iteration 2016-01-10 16:45:10 -08:00
Kohsuke Kawaguchi 1e080b7a7d [maven-release-plugin] prepare release jenkins-1.644 2016-01-10 16:45:10 -08:00
Daniel Beck 6306952779 Merge pull request #1887 from daspilker/with-plugin
allow @WithPlugin to install multiple plugins
2016-01-08 15:02:07 +01:00
Daniel Beck ad5b2d12a6 Merge pull request #1949 from csimons/prohibit-rename-node-to-existing
[FIXED JENKINS-31321] protect against node-rename corruption
2016-01-08 14:57:21 +01:00
Jesse Glick 6603409891 Use Logger rather than stderr. 2016-01-04 17:00:59 -05:00
Jesse Glick 28bef5f366 [JENKINS-30395] Work around ClosedByInterruptException by checking Thread.interrupted. 2016-01-04 10:23:31 -05:00
Christopher Simons 16d6429c58 [FIXED JENKINS-31321] protect against node-rename corruption
This change adds code to check that the user isn't attempting to rename
an existing node with the name of another existing node.  Previous to
this change, such rename operations would succeed and would corrupt node
configuration data.
2015-12-22 13:20:38 -05:00
Kohsuke Kawaguchi b56db0dbf6 [maven-release-plugin] prepare for next development iteration 2015-12-20 21:57:44 -08:00
Kohsuke Kawaguchi 025fe24d91 [maven-release-plugin] prepare release jenkins-1.643 2015-12-20 21:57:43 -08:00
Kohsuke Kawaguchi 6487214abb [maven-release-plugin] prepare for next development iteration 2015-12-13 21:39:57 -08:00
Kohsuke Kawaguchi 910f8c81de [maven-release-plugin] prepare release jenkins-1.642 2015-12-13 21:39:56 -08:00
Jesse Glick 60a23e5bca [FIXED JENKINS-31954] Stack overflow reconfiguring some settings where Descriptor.newInstance is gratuitously overridden. 2015-12-11 16:08:06 -05:00
Jesse Glick 42de07bba6 [FIXED JENKINS-24696] Cannot assume that Jenkins.getInstance() != null when we are running a boot failure script. 2015-12-09 14:53:24 -05:00
Jesse Glick 09722a982f Converting BootFailureTest from Groovy to Java. 2015-12-09 14:23:03 -05:00
Jesse Glick 6c2b16cf4a Merge pull request #1939 from jglick/StartupTest
Ensure that no warnings appear during startup
2015-12-09 10:19:24 -08:00