← Back to branch summary

~sergiusens/snappy/failSooner

~sergiusens/snappy/failSooner

Viewing all changes in revision 241.5.15.

Committer: Michael Vogt
Date: 2015-03-27 11:30:22 UTC
mfrom: (266 snappy)
mto: This revision was merged to the branch mainline in revision 273.
Revision ID: michael.vogt@ubuntu.com-20150327113022-hyww074ar2uwcff4

merged lp:snappy and resolved conflicts

files added:
cmd/snappy-go/cmd_rollback.go

cmd/snappy-go/errors.go

debian/ubuntu-snappy-cli.install

docs/frameworks.md

logger

logger/logger.go

logger/logger_test.go

snappy/rollback.go

snappy/rollback_test.go

files modified:
clickdeb/deb.go

clickdeb/deb_test.go

cmd/snappy-go/cmd_booted.go

cmd/snappy-go/cmd_build.go

cmd/snappy-go/cmd_config.go

cmd/snappy-go/cmd_hwassign.go

cmd/snappy-go/cmd_hwinfo.go

cmd/snappy-go/cmd_hwunassign.go

cmd/snappy-go/cmd_info.go

cmd/snappy-go/cmd_install.go

cmd/snappy-go/cmd_list.go

cmd/snappy-go/cmd_list_test.go

cmd/snappy-go/cmd_login.go

cmd/snappy-go/cmd_remove.go

cmd/snappy-go/cmd_search.go

cmd/snappy-go/cmd_set.go

cmd/snappy-go/cmd_set_test.go

cmd/snappy-go/cmd_update.go

cmd/snappy-go/main.go

debian/control

debian/rules

debian/snappy-autopilot.timer

debian/ubuntu-snappy.install

dependencies.tsv

gen-coverage.sh

helpers/helpers.go

helpers/helpers_test.go

partition/bootloader.go

partition/bootloader_grub.go

partition/bootloader_grub_test.go

partition/bootloader_uboot.go

partition/bootloader_uboot_test.go

partition/partition.go

partition/partition_test.go

partition/utils.go

partition/utils_test.go

priv/priv.go

priv/priv_test.go

run-checks

snappy/arch.go

snappy/auth.go

snappy/auth_test.go

snappy/build.go

snappy/build_test.go

snappy/click.go

snappy/click_test.go

snappy/common_test.go

snappy/config.go

snappy/config_test.go

snappy/dirs.go

snappy/errors.go

snappy/hwaccess.go

snappy/hwaccess_test.go

snappy/install.go

snappy/install_test.go

snappy/list.go

snappy/parts.go

snappy/parts_test.go

snappy/progress.go

snappy/progress_test.go

snappy/remove.go

snappy/remove_test.go

snappy/search.go

snappy/set.go

snappy/set_test.go

snappy/snapp.go

snappy/snapp_test.go

snappy/sort.go

snappy/sort_test.go

snappy/systemimage.go

snappy/systemimage_native.go

snappy/systemimage_native_test.go

snappy/systemimage_test.go

Show diffs side-by-side

added added

removed removed

clickdeb/deb.go

clickdeb/deb_test.go

cmd/snappy-go/cmd_booted.go

cmd/snappy-go/cmd_build.go

cmd/snappy-go/cmd_config.go

cmd/snappy-go/cmd_hwassign.go

cmd/snappy-go/cmd_hwinfo.go

cmd/snappy-go/cmd_hwunassign.go

cmd/snappy-go/cmd_info.go

cmd/snappy-go/cmd_install.go

cmd/snappy-go/cmd_list.go

cmd/snappy-go/cmd_list_test.go

cmd/snappy-go/cmd_login.go

cmd/snappy-go/cmd_remove.go

cmd/snappy-go/cmd_rollback.go

cmd/snappy-go/cmd_search.go

cmd/snappy-go/cmd_set.go

cmd/snappy-go/cmd_set_test.go

cmd/snappy-go/cmd_update.go

cmd/snappy-go/errors.go

cmd/snappy-go/main.go

debian/snappy-autopilot.timer

debian/ubuntu-snappy-cli.install

debian/ubuntu-snappy.install

dependencies.tsv

docs/frameworks.md

gen-coverage.sh

helpers/helpers.go

helpers/helpers_test.go

logger/logger.go

logger/logger_test.go

partition/bootloader.go

partition/bootloader_grub.go

partition/bootloader_grub_test.go

partition/bootloader_uboot.go

partition/bootloader_uboot_test.go

partition/partition.go

partition/partition_test.go

partition/utils.go

partition/utils_test.go

priv/priv_test.go

snappy/auth_test.go

snappy/build.go

snappy/build_test.go

snappy/click.go

snappy/click_test.go

snappy/common_test.go

snappy/config.go

snappy/config_test.go

snappy/errors.go

snappy/hwaccess.go

snappy/hwaccess_test.go

snappy/install.go

snappy/install_test.go

snappy/parts.go

snappy/parts_test.go

snappy/progress.go

snappy/progress_test.go

snappy/remove.go

snappy/remove_test.go

snappy/rollback.go

snappy/rollback_test.go

snappy/search.go

snappy/set_test.go

snappy/snapp.go

snappy/snapp_test.go

snappy/sort_test.go

snappy/systemimage.go

snappy/systemimage_native.go

snappy/systemimage_native_test.go

snappy/systemimage_test.go

Older »