Merge lp:~sergiusens/snapcraft/1500857 into lp:~snappy-dev/snapcraft/core
Proposed by
Sergio Schvezov
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Sergio Schvezov | ||||
Approved revision: | 217 | ||||
Merged at revision: | 217 | ||||
Proposed branch: | lp:~sergiusens/snapcraft/1500857 | ||||
Merge into: | lp:~snappy-dev/snapcraft/core | ||||
Diff against target: |
589 lines (+72/-72) 29 files modified
docs/intro.md (+5/-5) docs/your-first-snap.md (+8/-8) examples/downloader-with-wiki-parts/snapcraft.yaml (+1/-1) examples/godd/snapcraft.yaml (+1/-1) examples/gopaste/snapcraft.yaml (+1/-1) examples/java-hello-world/snapcraft.yaml (+2/-2) examples/libpipeline/snapcraft.yaml (+2/-2) examples/py2-project/snapcraft.yaml (+1/-1) examples/py3-project/snapcraft.yaml (+2/-2) examples/qmldemo/snapcraft.yaml (+2/-2) examples/tomcat-maven-webapp/snapcraft.yaml (+3/-3) examples/webcam-webui/snapcraft.yaml (+3/-3) integration-tests/data/bzr-head/snapcraft.yaml (+1/-1) integration-tests/data/bzr-tag/snapcraft.yaml (+1/-1) integration-tests/data/conflicts/snapcraft.yaml (+2/-2) integration-tests/data/dependencies/snapcraft.yaml (+3/-3) integration-tests/data/git-branch/snapcraft.yaml (+1/-1) integration-tests/data/git-head/snapcraft.yaml (+1/-1) integration-tests/data/git-tag/snapcraft.yaml (+1/-1) integration-tests/data/hg-branch/snapcraft.yaml (+1/-1) integration-tests/data/hg-head/snapcraft.yaml (+1/-1) integration-tests/data/hg-tag/snapcraft.yaml (+1/-1) integration-tests/data/pip-requirements/snapcraft.yaml (+2/-2) integration-tests/data/pypi-config/snapcraft.yaml (+1/-1) integration-tests/data/simple-copy/snapcraft.yaml (+1/-1) integration-tests/data/simple-scons/snapcraft.yaml (+1/-1) integration-tests/data/simple-tar/snapcraft.yaml (+9/-9) snapcraft/tests/test_yaml.py (+11/-11) snapcraft/yaml.py (+3/-3) |
||||
To merge this branch: | bzr merge lp:~sergiusens/snapcraft/1500857 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Schvezov | Approve | ||
Zygmunt Krynicki | Approve | ||
Review via email:
|
Commit message
Revert type to plugin
To post a comment you must log in.
+1, looks good