Created by Adam Collard and last modified
Get this branch:
bzr branch lp:~adam-collard/landscape-client/juju-info-at-registration
Only Adam Collard can upload to this branch. If you are Adam Collard please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Adam Collard
Landscape Client

Recent revisions

733. By Adam Collard

Merge juju-info-at-registration [f=1229630] [r=bjornt,ack] [a=Adam Collard]
Add Juju information at registration time.

 * Changed schema of JUJU_INFO message to be strict about the keys
 * Re-used schema for REGISTER and REGISTER_CLOUD_VM messages
 * Added l.lib.juju as resting ground for json parsing and error handling
 * Moved juju_filename to main config object, not just specific to monitor

732. By Björn Tillenius

Merge unmet-dependencies-bug-1203855 [f=1203855] [r=tribaal,ack] [a=Björn Tillenius]
Don't omit the package from the package changer result text if it's
broken but we don't know why.

When a package is broken we check certain dependency to see whether they
are satisfied. If all the dependencies we check are satisified, the
package wasn't reported as being broken.

Ideally we should write why the package is broken, but I have been
unable to reproduce the error in the bug report.

731. By Geoff Teale

Merge allow-duplicate-keys-in-config [f=1229200] [r=ack,tribaal] [a=Geoff Teale]
This branch catches ConfigObjError instances that are returned at the
end of parsing landscape-client.conf if there are issues in that file
(for example duplicate keys). Those errors are logged and the rest of
the configuration is recovered from the error and passed back. In
this way we emulate the tolerant behaviour we had prior to the switch
to ConfigObj.

730. By David Britton

Merge unclean-warnings [f=] [r=ack,tribaal] [a=David Britton]
--unclean-warnings turn reactor uncleans into warnings instead of errors

729. By Alberto Donato

Merge touch-file-flaky-test-fix [f=1229245] [r=tribaal,adam-collard] [a=Alberto Donato]
Fix mocking for a flaky test.

728. By Adam Collard

Merge juju-message-type [f=1226863] [r=tribaal,free.ekanayaka] [a=Adam Collard]
Add JujuInfo plugin and associated juju-info message.

727. By Chris Glass

Merge fix-1228301-config-object-auto-list [f=1228301] [r=adam-collard,free.ekanayaka] [a=Chris Glass]
Prevent ConfigObj from being smart about list types

726. By David Britton

Merge client-tarmac-config [f=1228202] [r=fcorrea,tribaal] [a=David Britton]
Include tarmac auto-landing config in the client dev directory.

725. By Chris Glass

Merge rename-metadata-annotations [f=1226087] [r=free.ekanayaka,ack] [a=Chris Glass]
This branch renames the meta-data.d/ directory to annotations.d/

724. By Geoff Teale

Merge assertIsNone-in-deployment-tests [f=1226098] [r=chad.smith,davidpbritton] [a=Geoff Teale]
Lucid doesn't have assertIsNone. changed to assertEqual

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.