lp://staging/~mvo/snappy/snappy-lp1488114-msg

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://staging/~snappy-dev/snappy/snappy-moved-to-github

Leo Arias (community): Approve on 2015-10-27

Federico Gimenez: Pending (continuous-integration) requested 2015-08-26

Diff: 388 lines (+141/-21)

17 files modified

_integration-tests/reboot-wrapper (+11/-0)
_integration-tests/tests/autopilot-msg_test.go (+56/-0)
cmd/snappy/cmd_activate.go (+1/-1)
cmd/snappy/cmd_booted.go (+1/-1)
cmd/snappy/cmd_grub_migrate.go (+1/-1)
cmd/snappy/cmd_hwassign.go (+1/-1)
cmd/snappy/cmd_hwinfo.go (+1/-1)
cmd/snappy/cmd_hwunassign.go (+1/-1)
cmd/snappy/cmd_install.go (+1/-1)
cmd/snappy/cmd_purge.go (+1/-1)
cmd/snappy/cmd_remove.go (+1/-1)
cmd/snappy/cmd_rollback.go (+1/-1)
cmd/snappy/cmd_service.go (+6/-6)
cmd/snappy/cmd_set.go (+1/-1)
cmd/snappy/cmd_update.go (+1/-1)
cmd/snappy/common.go (+48/-3)
po/snappy.pot (+8/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1488114: Confusing message while manually updating during an automatic update

Critical

Fix Released

Link a bug report

Related blueprints

648. By Michael Vogt on 2015-10-16

update to compile with trunk

647. By Michael Vogt on 2015-10-16

merged lp:snappy

646. By Michael Vogt on 2015-09-18

merged lp:snappy and resolved conflicts

645. By Michael Vogt on 2015-09-18

_integration-tests/tests/autopilot-msg_test.go: add missing cleanup

644. By Michael Vogt on 2015-08-27

rename withMutex->withMutexAndRetry (thanks Leo!)

643. By Michael Vogt on 2015-08-27

merged lp:~elopio/snappy/sudo_path (many thanks)

642. By Michael Vogt on 2015-08-26

show autopilot specific message if its running and add integration test

641. By Michael Vogt on 2015-08-26

auto-retry if the lock is taken

640. By Leo Arias on 2015-08-26

Added a bzrignore for the integration tests output. by elopio approved by sergiusens

639. By Leo Arias on 2015-08-26

Removed the ssh-copy-id from the integration tests execution. It's not really necessary, and it's causing time outs. by elopio approved by sergiusens