Created by Adam Collard on 2014-06-13 and last modified on 2014-06-13
Get this branch:
bzr branch lp:~adam-collard/charms/trusty/landscape-client/landscape-client-multiple-juju-files
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

Recent revisions

46. By Adam Collard on 2014-06-13

Rename delete=False to try_to_register=True (danilo's review)

45. By Adam Collard on 2014-06-13

Make multiple Juju info files work with 13.07 client

44. By Chris Glass on 2014-06-12

Fixed typoes and stray whitespace

43. By Chris Glass on 2014-06-12

As suggested, try to create the dir anyway and catch OSError

42. By Chris Glass on 2014-06-12

Made the relation-departed hook tests leaner.

41. By Chris Glass on 2014-06-12

Fixing hooks tests exposed some problems with the code.

40. By Chris Glass on 2014-06-12

Made the charm output juju info in a JSON file in the juju-info.d/ subdirectory
of the ata dir instead of in a juju-info.json file.

39. By Chris Glass on 2014-05-30

Merge trunk

38. By Björn Tillenius on 2014-05-09

Merged apt-retry [r=tribaal,davidpbritton].

Retry apt-get if the lock can't be aquired. If we get an error from
apt-get we'll retry for 5 minutes.

Currently the code retries on any error, since I couldn't see an
easy way of checking for locking errors only.

37. By Adam Collard on 2014-03-10

Merged ssl-certificate-confusion [r=tribaal,ack] [f=1287711].

Ensure that we always try to decode the base64 encoded ssl key whenever we write the configuration, not just in registration-relation-{joined,changed}

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.