lp:~tribaal/landscape-client/rename-metadata-annotations

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~landscape/landscape-client/trunk at revision 725

Free Ekanayaka (community): Approve on 2013-09-18

Alberto Donato (community): Approve on 2013-09-17

Diff: 310 lines (+64/-53)

8 files modified

landscape/configuration.py (+3/-2)
landscape/deployment.py (+3/-3)
landscape/message_schemas.py (+2/-4)
landscape/monitor/computerinfo.py (+13/-11)
landscape/monitor/tests/test_computerinfo.py (+27/-19)
landscape/tests/test_configuration.py (+5/-5)
landscape/tests/test_deployment.py (+5/-5)
landscape/user/management.py (+6/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1226087: Rename metadata.d directory to annotations.d

High

Fix Released

Link a bug report

Related blueprints

732. By Chris Glass on 2013-09-18

Added bug number to "deactivated" comments.

731. By Chris Glass on 2013-09-18

Deactivate EC2 reporting for the time being.

730. By Chris Glass on 2013-09-18

Lint fixes

729. By Chris Glass on 2013-09-18

Reanamed internal variable from meta_data to annotations.

728. By Chris Glass on 2013-09-18

Merging second development branch into this one.
The merge branch changes the message key from "meta-data" to "annotations".

Remains to be done: One branch to deactivate the EC2 reporting code (in a separate branch so that we can reactivate it easily in the future).

727. By Chris Glass on 2013-09-17

Addresses comment #1 - using generic annotations instead of juju-specific ones
to avoid confusion.
Renamed variables and test methods.

726. By Chris Glass on 2013-09-17

Fix typo in docstring

725. By Chris Glass on 2013-09-17

Changed log message from "metadata" to "data" since it was not meta at all

724. By Chris Glass on 2013-09-17

Renamed the meta-data.d/ directory to annotations.d/

723. By Geoff Teale on 2013-09-16

Merge use-configobj [f=1221659] [r=tribaal,free.ekanayaka] [a=Geoff Teale]
This branch does a minimal conversion of the landscape-client config
system to use ConfigObj instead of ConfigParser, which fixes the issue
of trashing any comments in the configuration file when we make
updates to it (ConfigParser simply ignores comments at read time, and
is not capable of writing them).