Branch: refs/heads/master
Home: https://github.com/jenkinsci/jobConfigHistory-plugin
Commit: de42bc3278360bfb54803477d79c320566066cc3
https://github.com/jenkinsci/jobConfigHistory-plugin/commit/de42bc3278360bfb54803477d79c320566066cc3
Author: kstutz <kathi.st...@1und1.de>
Date: 2013-02-20 (Wed, 20 Feb 2013)
Changed paths:
M src/main/java/hudson/plugins/jobConfigHistory/JobConfigBadgeAction.java
M src/main/java/hudson/plugins/jobConfigHistory/JobConfigHistory.java
M
src/main/java/hudson/plugins/jobConfigHistory/JobConfigHistoryActionFactory.java
A src/main/java/hudson/plugins/jobConfigHistory/JobConfigHistoryPurger.java
M
src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistory/config.jelly
M src/main/resources/hudson/plugins/jobConfigHistory/Messages.properties
M src/main/resources/hudson/plugins/jobConfigHistory/Messages_es.properties
A src/main/webapp/help/help-maxDaysToKeepEntries.html
M
src/test/java/hudson/plugins/jobConfigHistory/JobConfigBadgeActionTest.java
M
src/test/java/hudson/plugins/jobConfigHistory/JobConfigHistoryJobListenerTest.java
A
src/test/java/hudson/plugins/jobConfigHistory/JobConfigHistoryPurgerTest.java
M
src/test/java/hudson/plugins/jobConfigHistory/JobConfigHistoryRootActionTest.java
M src/test/java/hudson/plugins/jobConfigHistory/JobConfigHistoryTest.java
A
src/test/resources/hudson/plugins/jobConfigHistory/JobConfigBadgeActionTest.zip
A
src/test/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryPurgerTest.zip
Log Message:
-----------
Resolve merge conflict
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
