Merge branch 'security' into security-rc
Conflicts: core/src/main/java/hudson/model/AbstractItem.java core/src/main/java/hudson/security/ACL.java test/src/test/groovy/hudson/model/AbstractProjectTest.groovy
Showing
想要评论请 注册 或 登录
Conflicts: core/src/main/java/hudson/model/AbstractItem.java core/src/main/java/hudson/security/ACL.java test/src/test/groovy/hudson/model/AbstractProjectTest.groovy