← Back to branch summary

~jocave/snapcraft/plainbox-provider-plugin

~jocave/snapcraft/plainbox-provider-plugin

Viewing all changes in revision 114.1.7.

Committer: Michael Terry
Date: 2015-08-06 14:59:07 UTC
mfrom: (129 snapcraft)
mto: This revision was merged to the branch mainline in revision 132.
Revision ID: michael.terry@canonical.com-20150806145907-wzkkzm3mitiewa03

Merge from trunk

files added:
README.md

docs/intro.md

docs/your-first-snap.md

examples/py2-project

examples/py2-project/Makefile

examples/py2-project/meta

examples/py2-project/meta/package.yaml

examples/py2-project/meta/readme.md

examples/py2-project/sha3sum.py

examples/py2-project/snapcraft.yaml

examples/qmldemo

examples/qmldemo/demo.qml

examples/qmldemo/meta

examples/qmldemo/meta/package.yaml

examples/qmldemo/meta/readme.md

examples/qmldemo/snapcraft.yaml

integration-tests/data/assemble/binary1.after

integration-tests/data/hg-branch

integration-tests/data/hg-branch/snapcraft.yaml

integration-tests/data/hg-head

integration-tests/data/hg-head/snapcraft.yaml

integration-tests/data/hg-tag

integration-tests/data/hg-tag/snapcraft.yaml

plugins/python2-project.yaml

plugins/python2.yaml

plugins/qml.yaml

snapcraft/log.py

snapcraft/plugins/python2.py

snapcraft/plugins/python2_project.py

snapcraft/plugins/qml.py

snapcraft/tests/test_log.py

snapcraft/tests/test_ubuntu_plugin.py

files removed:
docs/flow.md

files renamed:
README.md => HACKING.md

files modified:
debian/changelog

debian/control

examples/webcam-webui-snap/snapcraft.yaml

examples/webcam-webui-snap/webcam-webui

integration-tests/data/assemble/package.yaml.after

integration-tests/data/assemble/snappy/package.yaml

integration-tests/units/jobs.pxu

plugins/ubuntu.yaml

snapcraft/__init__.py

snapcraft/cmds.py

snapcraft/common.py

snapcraft/main.py

snapcraft/plugin.py

snapcraft/plugins/copy.py

snapcraft/plugins/jdk.py

snapcraft/plugins/python3.py

snapcraft/plugins/tests/test_ubuntu.py

snapcraft/plugins/ubuntu.py

snapcraft/tests/__init__.py

snapcraft/tests/test_base_plugin.py

snapcraft/tests/test_cmds.py

snapcraft/tests/test_plugin.py

snapcraft/tests/test_yaml.py

snapcraft/yaml.py

Show diffs side-by-side

added added

removed removed

debian/changelog

docs/your-first-snap.md

examples/py2-project/

examples/py2-project/Makefile

examples/py2-project/meta/

examples/py2-project/meta/package.yaml

examples/py2-project/meta/readme.md

examples/py2-project/sha3sum.py

examples/py2-project/snapcraft.yaml

examples/qmldemo/

examples/qmldemo/demo.qml

examples/qmldemo/meta/

examples/qmldemo/meta/package.yaml

examples/qmldemo/meta/readme.md

examples/qmldemo/snapcraft.yaml

examples/webcam-webui-snap/snapcraft.yaml

examples/webcam-webui-snap/webcam-webui

integration-tests/data/assemble/binary1.after

integration-tests/data/assemble/package.yaml.after

integration-tests/data/assemble/snappy/package.yaml

integration-tests/data/hg-branch/

integration-tests/data/hg-branch/snapcraft.yaml

integration-tests/data/hg-head/

integration-tests/data/hg-head/snapcraft.yaml

integration-tests/data/hg-tag/

integration-tests/data/hg-tag/snapcraft.yaml

integration-tests/units/jobs.pxu

plugins/python2-project.yaml

plugins/python2.yaml

plugins/qml.yaml

plugins/ubuntu.yaml

snapcraft/__init__.py

snapcraft/cmds.py

snapcraft/common.py

snapcraft/log.py

snapcraft/main.py

snapcraft/plugin.py

snapcraft/plugins/copy.py

snapcraft/plugins/jdk.py

snapcraft/plugins/python2.py

snapcraft/plugins/python2_project.py

snapcraft/plugins/python3.py

snapcraft/plugins/qml.py

snapcraft/plugins/tests/test_ubuntu.py

snapcraft/plugins/ubuntu.py

snapcraft/tests/__init__.py

snapcraft/tests/test_base_plugin.py

snapcraft/tests/test_cmds.py

snapcraft/tests/test_log.py

snapcraft/tests/test_plugin.py

snapcraft/tests/test_ubuntu_plugin.py

snapcraft/tests/test_yaml.py

snapcraft/yaml.py

Older »