Merge lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github into lp://qastaging/snappy/15.04
Proposed by
Michael Vogt
Status: | Merged |
---|---|
Approved by: | John Lenton |
Approved revision: | 765 |
Merged at revision: | 714 |
Proposed branch: | lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github |
Merge into: | lp://qastaging/snappy/15.04 |
Diff against target: |
9111 lines (+4553/-1052) 109 files modified
_integration-tests/data/snaps/basic-binaries/bin/echo (+3/-0) _integration-tests/data/snaps/basic-binaries/meta/package.yaml (+6/-0) _integration-tests/data/snaps/basic-binaries/meta/readme.md (+3/-0) _integration-tests/data/snaps/dev-kmsg/bin/reader (+3/-0) _integration-tests/data/snaps/dev-kmsg/meta/package.yaml (+6/-0) _integration-tests/data/snaps/dev-kmsg/meta/readme.md (+5/-0) _integration-tests/tests/activate_test.go (+84/-0) _integration-tests/tests/apt_test.go (+5/-4) _integration-tests/tests/config_test.go (+114/-0) _integration-tests/tests/examples_test.go (+72/-0) _integration-tests/tests/failover_rclocal_crash_test.go (+13/-10) _integration-tests/tests/failover_systemd_loop_test.go (+19/-17) _integration-tests/tests/failover_test.go (+10/-10) _integration-tests/tests/failover_zero_size_file_test.go (+12/-11) _integration-tests/tests/hwAssign_test.go (+106/-0) _integration-tests/tests/info_test.go (+22/-17) _integration-tests/tests/installApp_test.go (+3/-33) _integration-tests/tests/installFramework_test.go (+12/-13) _integration-tests/tests/list_test.go (+8/-7) _integration-tests/tests/rollback_test.go (+23/-17) _integration-tests/tests/search_test.go (+8/-7) _integration-tests/tests/service_test.go (+37/-37) _integration-tests/tests/snapd_1_0_packages_test.go (+2/-0) _integration-tests/tests/snapd_1_0_test.go (+41/-0) _integration-tests/tests/ubuntuFan_test.go (+10/-9) _integration-tests/tests/update_test.go (+8/-8) _integration-tests/tests/writablePaths_test.go (+3/-3) _integration-tests/testutils/autopkgtest/autopkgtest_test.go (+1/-1) _integration-tests/testutils/autopkgtest/ssh.go (+1/-1) _integration-tests/testutils/build/snap.go (+3/-3) _integration-tests/testutils/build/snap_test.go (+3/-3) _integration-tests/testutils/cli/cli.go (+64/-0) _integration-tests/testutils/cli/cli_test.go (+113/-0) _integration-tests/testutils/common/common.go (+20/-55) _integration-tests/testutils/common/info.go (+2/-1) _integration-tests/testutils/partition/bootloader.go (+4/-3) _integration-tests/testutils/partition/bootloader_test.go (+1/-1) _integration-tests/testutils/partition/partition.go (+89/-0) _integration-tests/testutils/partition/partition_test.go (+170/-0) _integration-tests/testutils/runner/runner.go (+1/-1) _integration-tests/testutils/wait/wait.go (+3/-3) cmd/snappy/cmd_activate.go (+60/-0) cmd/snappy/cmd_build.go (+8/-2) cmd/snappy/cmd_info.go (+2/-2) cmd/snappy/cmd_internal_unpack.go (+1/-1) daemon/api.go (+168/-164) daemon/api_test.go (+174/-124) daemon/daemon.go (+0/-7) daemon/daemon_test.go (+95/-0) daemon/response.go (+16/-15) daemon/snappy_part_iface_test.go (+2/-2) data/failure.txt (+8/-0) data/success.txt (+20/-0) debian/control (+3/-1) debian/ubuntu-snappy.snapd.socket (+5/-1) dirs/dirs.go (+44/-44) gen-coverage.sh (+4/-18) helpers/helpers.go (+8/-7) helpers/helpers_test.go (+19/-3) pkg/clickdeb/deb.go (+5/-0) pkg/lightweight/example_test.go (+58/-0) pkg/lightweight/lightweight.go (+527/-0) pkg/lightweight/lightweight_test.go (+417/-0) pkg/lightweight/split_test.go (+70/-0) pkg/remote/remote.go (+45/-0) pkg/removed/removed.go (+158/-0) pkg/removed/removed_test.go (+137/-0) pkg/snapfs/pkg.go (+142/-0) pkg/snapfs/pkg_test.go (+173/-0) po/de.po (+18/-3) po/es.po (+18/-3) po/gl.po (+57/-4) po/snappy.pot (+13/-1) run-checks (+28/-11) snappy/build.go (+46/-15) snappy/build_test.go (+67/-13) snappy/click.go (+25/-28) snappy/click_test.go (+60/-49) snappy/common_test.go (+40/-5) snappy/datadir.go (+6/-1) snappy/datadir_test.go (+19/-15) snappy/firstboot.go (+1/-1) snappy/firstboot_test.go (+1/-1) snappy/globals.go (+3/-2) snappy/hwaccess.go (+5/-4) snappy/hwaccess_test.go (+15/-14) snappy/install_test.go (+7/-5) snappy/oem.go (+8/-7) snappy/oem_test.go (+5/-4) snappy/parts.go (+23/-12) snappy/parts_test.go (+37/-15) snappy/pkgformat.go (+64/-0) snappy/purge.go (+2/-1) snappy/purge_test.go (+6/-4) snappy/security.go (+3/-2) snappy/security_test.go (+4/-3) snappy/service.go (+6/-1) snappy/service_test.go (+24/-6) snappy/set_active.go (+53/-0) snappy/set_active_test.go (+20/-0) snappy/set_test.go (+9/-8) snappy/snapp.go (+56/-63) snappy/snapp_snapfs_test.go (+84/-0) snappy/snapp_test.go (+61/-37) snappy/sort_test.go (+5/-4) snappy/systemimage.go (+49/-27) snappy/systemimage_native.go (+12/-1) snappy/systemimage_native_test.go (+12/-0) snappy/systemimage_test.go (+99/-16) |
To merge this branch: | bzr merge lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John Lenton (community) | Approve | ||
Review via email:
|
Commit message
Merge trunk fixes.
Description of the change
Update 15.04 from trunk to bring in the husks^Wlightweight improvements from for the rest API
To post a comment you must log in.
... studiously ignoring this mp until a few more branches land...