Changeset [5a5b1cf127e96e2d69a978d1b44dbe588f21b285] by Greg Schueler
Revision 5a5b1cf127e96e2d69a978d1b44dbe588f21b285,
committed by Greg Schueler
· November 11th, 2011 @ 09:00 AM
Merge branch 'development' into maven2merge
Conflicts:
rundeckapp/application.properties
https://github.com/dtolabs/rundeck/commit/5a5b1cf127e96e2d69a978d1b...
20 changed files
-
A
core/src/main/java/com/dtolabs/rundeck/core/authorization/BaseAuthorization.java -
A
core/src/main/java/com/dtolabs/rundeck/core/authorization/DenyAuthorization.java -
M
RELEASE.md -
M
core/build.gradle -
M
core/src/main/java/com/dtolabs/rundeck/core/authorization/NoAuthorization.java -
M
core/src/main/resources/com/dtolabs/launcher/setup/templates/apitoken.aclpolicy.template -
M
plugins/build.gradle -
M
rundeckapp/application.properties -
M
rundeckapp/grails-app/conf/AuthorizationFilters.groovy -
M
rundeckapp/grails-app/conf/BootStrap.groovy -
M
rundeckapp/grails-app/conf/ProjectSelectFilters.groovy -
M
rundeckapp/grails-app/controllers/FrameworkController.groovy -
M
rundeckapp/grails-app/controllers/MenuController.groovy -
M
rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy -
M
rundeckapp/grails-app/services/ExecutionService.groovy -
M
rundeckapp/grails-app/services/FrameworkService.groovy -
M
rundeckapp/grails-app/services/ScheduledExecutionService.groovy -
M
rundeckapp/grails-app/views/common/_error.gsp -
M
test/api/test-jobs-import-yaml.sh -
M
version.properties