lp://qastaging/~gandelman-a/juju-deployer/trunk

Branch merges

Propose for merging

3 branches proposed for merging into this one.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

73. By Adam Gandelman on 2013-09-03

Merge lp:juju-deployer/darwin.

72. By Adam Gandelman on 2013-05-31

Allow configs to load other configs with 'include-config' parameter

Config files can now have an 'include-config' parameter that specifies
another file that will be loaded along with that config. Configs
can chain load similar to specifying multiple config files on the
command-line.

71. By Adam Gandelman on 2013-04-29

Merge lp:~sidnei/juju-deployer/config-yaml-loader

Merged branch lp://qastaging/~sidnei/juju-deployer/config-yaml-loader

70. By Adam Gandelman on 2013-04-24

Merge inheriting multiple configs and some tests from Sidnei de Silva.

Merged branch lp://qastaging/~sidnei/juju-deployer/inherit-multiple

69. By Adam Gandelman on 2013-03-12

Merge Key error fix from Sidnei da Silva.

Merged branch lp://qastaging/~sidnei/juju-deployer/relation-not-in-target

68. By Adam Gandelman on 2013-03-05

Merge 'build' command support + pep8 cleanup from sidnei.

Merged branch lp://qastaging/~sidnei/juju-deployer/build-command

67. By Adam Gandelman on 2013-03-01

Merge mew's fix for unncomplicating relations.

Merged branch lp://qastaging/~mew/juju-deployer/uncomplicate-relations

66. By Adam Gandelman on 2013-03-01

Merge support for optional charm branches.

Merged branch lp://qastaging/~mew/juju-deployer/branch-optional

65. By Adam Gandelman on 2013-02-21

Merge support for loading option values from file/base64.

Merged branch lp://qastaging/~mew/juju-deployer/option-from-file

64. By Adam Gandelman on 2013-02-13

Fix regression in config inheritance wrt relations.