~allenap/maas/remove-squashfs

Viewing all changes in revision 1336.

  • Committer: Tarmac
  • Author(s): Martin Packman, Jeroen Vermeulen, John Arbash Meinel, Julian Edwards, Nick Veitch, Raphael Badin, Gavin Panella
  • Date: 2012-11-08 10:11:03 UTC
  • mfrom: (1333.1.5 merge-1.2)
  • Revision ID: tarmac-20121108101103-tr8kuvwbs0vd47ea
[r=gz][bug=][author=jameinel] Merge the lp:maas/1.2 branch into lp:maas and resolve conflicts.

There were a few text conflicts introduced because of the cherrypicks back to 1.2, but this should make it easier to keep 1.2 changes in sync with trunk.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: