Merge lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github into lp://qastaging/snappy/15.04

Proposed by Michael Vogt
Status: Merged
Approved by: Michael Vogt
Approved revision: 793
Merged at revision: 716
Proposed branch: lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github
Merge into: lp://qastaging/snappy/15.04
Diff against target: 3284 lines (+1579/-247)
64 files modified
_integration-tests/data/snaps/basic-binaries/bin/fail (+3/-0)
_integration-tests/data/snaps/basic-binaries/bin/success (+3/-0)
_integration-tests/data/snaps/basic-binaries/meta/package.yaml (+2/-0)
_integration-tests/data/snaps/basic-config/meta/hooks/config (+37/-0)
_integration-tests/data/snaps/basic-config/meta/package.yaml (+4/-0)
_integration-tests/data/snaps/basic-config/meta/readme.md (+3/-0)
_integration-tests/data/snaps/basic-framework/meta/package.yaml (+5/-0)
_integration-tests/data/snaps/basic-framework/meta/readme.md (+3/-0)
_integration-tests/data/snaps/basic-service/bin/start (+3/-0)
_integration-tests/data/snaps/basic-service/meta/package.yaml (+8/-0)
_integration-tests/data/snaps/basic-service/meta/readme.md (+3/-0)
_integration-tests/data/tpl/control (+1/-1)
_integration-tests/scripts/install-test-initramfs (+25/-0)
_integration-tests/scripts/resize-writable-test (+123/-0)
_integration-tests/tests/activate_test.go (+15/-8)
_integration-tests/tests/apt_test.go (+1/-1)
_integration-tests/tests/build_test.go (+8/-7)
_integration-tests/tests/config_test.go (+1/-1)
_integration-tests/tests/console_test.go (+141/-0)
_integration-tests/tests/examples_test.go (+114/-12)
_integration-tests/tests/failover_test.go (+2/-1)
_integration-tests/tests/hwAssign_test.go (+36/-11)
_integration-tests/tests/info_test.go (+5/-4)
_integration-tests/tests/initramfs_test.go (+63/-4)
_integration-tests/tests/installApp_test.go (+34/-36)
_integration-tests/tests/installFramework_test.go (+13/-4)
_integration-tests/tests/rollback_test.go (+5/-8)
_integration-tests/tests/service_test.go (+21/-14)
_integration-tests/tests/snapd_1_0_packages_test.go (+14/-3)
_integration-tests/tests/snapd_test.go (+6/-5)
_integration-tests/tests/ubuntuFan_test.go (+10/-4)
_integration-tests/testutils/build/snap.go (+5/-15)
_integration-tests/testutils/common/common.go (+10/-2)
_integration-tests/testutils/data/data.go (+39/-0)
_integration-tests/testutils/wait/wait.go (+3/-2)
_integration-tests/testutils/wait/wait_test.go (+2/-2)
cmd/snappy/cmd_info.go (+14/-4)
cmd/snappy/common_test.go (+6/-1)
coreconfig/config.go (+107/-6)
coreconfig/config_test.go (+189/-4)
daemon/api.go (+78/-3)
daemon/api_test.go (+224/-7)
daemon/daemon.go (+22/-0)
daemon/response.go (+11/-5)
daemon/task.go (+3/-3)
daemon/task_test.go (+3/-3)
docs/meta.md (+17/-4)
helpers/helpers.go (+7/-4)
helpers/helpers_test.go (+21/-0)
i18n/i18n.go (+3/-0)
pkg/remote/remote.go (+1/-0)
po/de.po (+6/-3)
po/es.po (+6/-3)
po/gl.po (+7/-4)
po/snappy.pot (+4/-1)
snappy/click.go (+1/-1)
snappy/click_test.go (+28/-0)
snappy/common_test.go (+1/-0)
snappy/install_test.go (+2/-5)
snappy/parts.go (+6/-4)
snappy/snapp.go (+12/-5)
snappy/snapp_test.go (+11/-8)
snappy/systemimage.go (+6/-9)
snappy/systemimage_test.go (+12/-15)
To merge this branch: bzr merge lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+275272@code.qastaging.launchpad.net

Description of the change

Merge trunk to 15.04 for the new stable release.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches