~allenap/maas/packaging.kill-all-the-configs-cluster

Viewing all changes in revision 409.

  • Committer: Gavin Panella
  • Date: 2015-06-29 16:38:41 UTC
  • mfrom: (381.4.1 packaging-regiond-conf)
  • Revision ID: gavin.panella@canonical.com-20150629163841-gzjewgrc5hcrmcax
Merged lp:~andreserl/maas/packaging_clusterd_conf into packaging.kill-all-the-configs-cluster, resolving conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: