Branch: refs/heads/master Home: https://github.com/jenkinsci/jenkins Commit: 868a41ab96be62458e656648602c26f84e9ba104 https://github.com/jenkinsci/jenkins/commit/868a41ab96be62458e656648602c26f84e9ba104 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-09 (Thu, 09 Mar 2017)
Changed paths: M core/src/main/java/jenkins/model/Jenkins.java Log Message: ----------- Save after calling setSecurityRealm or setAuthorizationStrategy. Commit: d26f59f3d70c0b7ad6a1c13579e82e5f6d57d61b https://github.com/jenkinsci/jenkins/commit/d26f59f3d70c0b7ad6a1c13579e82e5f6d57d61b Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: A .github/PULL_REQUEST_TEMPLATE.md M cli/pom.xml M core/pom.xml M core/src/main/java/hudson/Main.java M core/src/main/java/hudson/PluginManager.java M core/src/main/java/hudson/Util.java M core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java M core/src/main/java/hudson/model/AbstractItem.java M core/src/main/java/hudson/model/Items.java M core/src/main/java/hudson/model/Node.java M core/src/main/java/hudson/model/ParametersAction.java M core/src/main/java/hudson/model/Queue.java M core/src/main/java/hudson/model/UpdateSite.java M core/src/main/java/hudson/scheduler/RareOrImpossibleDateException.java M core/src/main/java/hudson/search/Search.java M core/src/main/java/hudson/slaves/CloudProvisioningListener.java M core/src/main/java/hudson/tasks/CommandInterpreter.java A core/src/main/java/hudson/util/FormFillFailure.java M core/src/main/java/hudson/util/RunList.java M core/src/main/java/hudson/views/BuildButtonColumn.java M core/src/main/java/jenkins/model/Jenkins.java A core/src/main/java/jenkins/security/ImpersonatingExecutorService.java A core/src/main/java/jenkins/security/ImpersonatingScheduledExecutorService.java M core/src/main/java/jenkins/security/UpdateSiteWarningsConfiguration.java M core/src/main/java/jenkins/security/UpdateSiteWarningsMonitor.java M core/src/main/java/jenkins/util/AtmostOneTaskExecutor.java A core/src/main/java/jenkins/util/InterceptingScheduledExecutorService.java M core/src/main/java/jenkins/util/Timer.java M core/src/main/java/jenkins/widgets/HistoryPageFilter.java M core/src/main/resources/hudson/PluginManager/check_ru.properties M core/src/main/resources/hudson/model/AbstractItem/delete_ru.properties M core/src/main/resources/hudson/model/AbstractItem/noWorkspace_ru.properties M core/src/main/resources/hudson/model/AllView/noJob_ru.properties M core/src/main/resources/hudson/model/FileParameterDefinition/config_ru.properties M core/src/main/resources/hudson/model/Job/buildTimeTrend_ru.properties M core/src/main/resources/hudson/model/Job/configure_ru.properties M core/src/main/resources/hudson/model/Job/index_ru.properties A core/src/main/resources/hudson/model/Job/requirePOST_ru.properties A core/src/main/resources/hudson/model/ListView/newJobButtonBar_ru.properties M core/src/main/resources/hudson/model/Messages.properties A core/src/main/resources/hudson/model/MyView/noJob_ru.properties M core/src/main/resources/hudson/model/ParametersDefinitionProperty/help_fr.html A core/src/main/resources/hudson/model/ProxyView/configure-entries_ru.properties A core/src/main/resources/hudson/model/UpdateCenter/CoreUpdateMonitor/message_ru.properties A core/src/main/resources/hudson/model/UpdateCenter/NoOpJob/row_ru.properties A core/src/main/resources/hudson/model/UpdateCenter/RestartJenkinsJob/Failure/status_ru.properties M core/src/main/resources/hudson/model/UpdateCenter/index_ru.properties M core/src/main/resources/hudson/model/View/newJob_ru.properties M core/src/main/resources/hudson/search/Search/search-failed.jelly M core/src/main/resources/hudson/triggers/Messages_ru.properties M core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.jelly M core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message.properties R core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message_da.properties M core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message_de.properties M core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message_es.properties R core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message_fr.properties M core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message_ja.properties M core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message_pt_BR.properties M core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message_sr.properties M core/src/main/resources/hudson/triggers/SCMTrigger/AdministrativeMonitorImpl/message_zh_TW.properties M core/src/main/resources/hudson/triggers/SCMTrigger/help_fr.html M core/src/main/resources/hudson/triggers/TimerTrigger/help_fr.html M core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly M core/src/main/resources/hudson/views/BuildButtonColumn/column.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_ar.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_bg.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_ca.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_cs.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_da.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_de.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_el.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_eo.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_es.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_es_AR.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_et.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_eu.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_fi.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_fr.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_ga_IE.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_he.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_hi_IN.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_hu.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_id.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_is.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_it.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_ja.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_kn.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_ko.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_lt.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_lv.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_mk.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_mr.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_nb_NO.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_nl.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_pl.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_pt_BR.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_pt_PT.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_ro.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_ru.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_sk.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_sl.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_sr.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_sv_SE.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_te.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_tr.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_uk.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_zh_CN.properties R core/src/main/resources/hudson/views/BuildButtonColumn/column_zh_TW.properties M core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure_ru.properties M core/src/main/resources/jenkins/model/Jenkins/_restart_ru.properties M core/src/main/resources/jenkins/model/Jenkins/_safeRestart_ru.properties A core/src/main/resources/jenkins/model/Jenkins/accessDenied_ru.properties M core/src/main/resources/jenkins/model/Jenkins/configure_ru.properties A core/src/main/resources/jenkins/model/Jenkins/load-statistics_ru.properties M core/src/main/resources/jenkins/model/Jenkins/loginError_ru.properties M core/src/main/resources/jenkins/model/Jenkins/newView_ru.properties A core/src/main/resources/jenkins/model/Jenkins/oops_ru.properties M core/src/main/resources/jenkins/model/Jenkins/projectRelationship-help_ru.properties M core/src/main/resources/jenkins/model/Jenkins/projectRelationship_ru.properties M core/src/main/resources/jenkins/model/Jenkins/systemInfo_ru.properties A core/src/main/resources/jenkins/model/Jenkins/threadDump_ru.properties M core/src/main/resources/jenkins/slaves/systemInfo/Messages_ru.properties A core/src/main/resources/lib/form/helpLink_ru.properties M core/src/main/resources/lib/form/select/select.js M core/src/main/resources/lib/hudson/artifactList_ru.properties M core/src/main/resources/lib/hudson/buildCaption_ru.properties M core/src/main/resources/lib/hudson/executors_ru.properties M core/src/main/resources/lib/hudson/project/config-assignedLabel_ru.properties M core/src/main/resources/lib/hudson/project/config-disableBuild_ru.properties M core/src/main/resources/lib/hudson/project/config-scm_ru.properties M core/src/main/resources/lib/hudson/project/config-upstream-pseudo-trigger_ru.properties A core/src/main/resources/lib/hudson/project/console-link_ru.properties M core/src/main/resources/lib/hudson/queue_ru.properties M core/src/main/resources/lib/hudson/rssBar-with-iconSize_ru.properties M core/src/main/resources/lib/hudson/scriptConsole_ru.properties M core/src/main/resources/lib/hudson/thirdPartyLicenses_ru.properties M core/src/main/resources/lib/layout/layout_ru.properties A core/src/main/resources/lib/layout/pane_ru.properties R core/src/main/resources/windows-service/jenkins-slave.xml M core/src/main/resources/windows-service/jenkins.xml M core/src/test/java/jenkins/widgets/HistoryPageFilterTest.java M pom.xml M test/pom.xml A test/src/test/java/jenkins/widgets/HistoryPageFilterInsensitiveSearchTest.java M translation-tool.pl M war/pom.xml M war/src/main/webapp/css/style.css M war/src/main/webapp/help/parameter/boolean-default_fr.html M war/src/main/webapp/help/parameter/boolean_fr.html M war/src/main/webapp/help/parameter/file-name_fr.html Log Message: ----------- Merge branch 'master' into security-settings-save Commit: 7360b980474441f7ec89229a60b9591df96e975a https://github.com/jenkinsci/jenkins/commit/7360b980474441f7ec89229a60b9591df96e975a Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M test/src/test/java/hudson/model/QueueTest.java Log Message: ----------- Jenkins.setNumExecutors already called save; redundant to do so again. Commit: ae345dc31ae9f566f54eb12c3394708fa8231c85 https://github.com/jenkinsci/jenkins/commit/ae345dc31ae9f566f54eb12c3394708fa8231c85 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M test/src/test/java/hudson/cli/ReloadConfigurationCommandTest.java Log Message: ----------- Fix test to avoid saving Jenkins.securityRealm/authorizationStrategy after we rewrote $JENKINS_HOME/config.xml, clobbering it. https://github.com/jenkinsci/jenkins-test-harness/pull/53 would simplify test code a bit. Commit: c096d49c37a6ca798120c552d4a835cf9f4bcd7a https://github.com/jenkinsci/jenkins/commit/c096d49c37a6ca798120c552d4a835cf9f4bcd7a Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M test/src/test/groovy/hudson/security/TokenBasedRememberMeServices2Test.groovy Log Message: ----------- Non-Serializable SecurityRealm’s. Commit: b24aaefcad07f8ff71fac3a93b5f0d3fe29b1ee6 https://github.com/jenkinsci/jenkins/commit/b24aaefcad07f8ff71fac3a93b5f0d3fe29b1ee6 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M test/src/test/java/hudson/model/QueueTest.java Log Message: ----------- Non-Serializable AuthorizationStrategy. Commit: 214f1b9bb74cbe0f557c367cefa9a1214f0e08b4 https://github.com/jenkinsci/jenkins/commit/214f1b9bb74cbe0f557c367cefa9a1214f0e08b4 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M test/src/test/java/lib/form/PasswordTest.java Log Message: ----------- Non-Serializable SecurityRealm, and simplifying with MockAuthorizationStrategy. Commit: 3fd02a718da220759fe04795efb8d108487b6209 https://github.com/jenkinsci/jenkins/commit/3fd02a718da220759fe04795efb8d108487b6209 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M test/src/test/java/hudson/model/UserTest.java Log Message: ----------- Non-Serializable SecurityRealm’s, consolidated into one implementation. Commit: a76ff0ad18af19b81cd999e6842b724ffcf2d811 https://github.com/jenkinsci/jenkins/commit/a76ff0ad18af19b81cd999e6842b724ffcf2d811 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-14 (Tue, 14 Mar 2017) Changed paths: M test/src/test/java/hudson/cli/CopyJobCommandTest.java M test/src/test/java/hudson/cli/CreateJobCommandTest.java M test/src/test/java/jenkins/model/JenkinsTest.java Log Message: ----------- Replacing complex and non-Serializable AuthorizationStrategy’s with MockAuthorizationStrategy. Commit: c5e1fc0919e1387cb1ea50b20a76a45ffa8971c0 https://github.com/jenkinsci/jenkins/commit/c5e1fc0919e1387cb1ea50b20a76a45ffa8971c0 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-16 (Thu, 16 Mar 2017) Changed paths: M core/src/main/java/jenkins/install/SetupWizard.java Log Message: ----------- Comment. Commit: 24dec27ed6edfe5269b463617d2be28878dc9975 https://github.com/jenkinsci/jenkins/commit/24dec27ed6edfe5269b463617d2be28878dc9975 Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-16 (Thu, 16 Mar 2017) Changed paths: M core/src/main/java/hudson/model/ItemGroupMixIn.java M core/src/main/java/hudson/model/ResourceController.java M core/src/main/java/hudson/model/listeners/ItemListener.java M test/src/test/java/hudson/jobs/CreateItemTest.java Log Message: ----------- Merge branch 'master' into security-settings-save Commit: ee01d1b920bc2c4211eeb14e009538ab705ad92e https://github.com/jenkinsci/jenkins/commit/ee01d1b920bc2c4211eeb14e009538ab705ad92e Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-16 (Thu, 16 Mar 2017) Changed paths: M test/src/test/java/hudson/cli/ConnectNodeCommandTest.java Log Message: ----------- Depending on what seems to have been timing conditions, connectNodeShouldSucceedWithForce could fail with a cryptic message. Found an error in the launch log: java.lang.IllegalStateException: Already connected at hudson.slaves.SlaveComputer.setChannel(SlaveComputer.java:567) at hudson.slaves.SlaveComputer.setChannel(SlaveComputer.java:390) at hudson.slaves.CommandLauncher.launch(CommandLauncher.java:132) at hudson.slaves.SlaveComputer$1.call(SlaveComputer.java:262) I think the slave was being launched in the background, and then the test tried to disconnect and reconnect it. Perhaps if these actions overlapped in time, the loose locking semantics of SlaveComputer.setChannel could cause the error. Commit: 4fd4bd3a28cf80913baa3632bb3f7f5d0a00c3ed https://github.com/jenkinsci/jenkins/commit/4fd4bd3a28cf80913baa3632bb3f7f5d0a00c3ed Author: Jesse Glick <jgl...@cloudbees.com> Date: 2017-03-17 (Fri, 17 Mar 2017) Changed paths: M core/src/main/java/jenkins/install/SetupWizard.java M core/src/main/java/jenkins/model/Jenkins.java M test/src/test/groovy/hudson/security/TokenBasedRememberMeServices2Test.groovy M test/src/test/java/hudson/cli/ConnectNodeCommandTest.java M test/src/test/java/hudson/cli/CopyJobCommandTest.java M test/src/test/java/hudson/cli/CreateJobCommandTest.java M test/src/test/java/hudson/cli/ReloadConfigurationCommandTest.java M test/src/test/java/hudson/model/QueueTest.java M test/src/test/java/hudson/model/UserTest.java M test/src/test/java/jenkins/model/JenkinsTest.java M test/src/test/java/lib/form/PasswordTest.java Log Message: ----------- Merge pull request #2790 from jglick/security-settings-save Save after calling setSecurityRealm or setAuthorizationStrategy Compare: https://github.com/jenkinsci/jenkins/compare/1b3121db248e...4fd4bd3a28cf -- 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/d/optout.