Viewing all changes in revision 114.
- Committer: Vincent Ladeuil
- Date: 2016-12-16 16:15:52 UTC
- mfrom: (89.1.218 trunk)
- Revision ID: v.ladeuil+lp@free.fr-20161216161552-yw4aanipo29q7rne
Merge ols resolving conflicts.
Revert to the original jobs directory. The real solution is probably to have jobs be specific to a given deployment while the jenkaas project will keep its onw jobs definitions and may provide templates.
Revert to the original jobs directory. The real solution is probably to have jobs be specific to a given deployment while the jenkaas project will keep its onw jobs definitions and may provide templates.
- files added:
- jobs
- olsjenkaas/tests/branches
- files removed:
- .bzrignore
- jobs
- files renamed:
- jobs/bzr-2.7.yaml => jobs/bzr-2.7.yaml
- jobs/project-defaults.yaml => jobs/project-defaults.yaml
- jobs/project-landing-tests.yaml => jobs/project-templates.yaml
- project/build-charm => project/run-with-creds
- files modified:
- README.rst
expand all
collapse all
added
removed
