lp:~ubuntu-branches/ubuntu/raring/juju/raring-201304221742

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/raring/juju

Ubuntu branches: Pending requested 2013-04-22

Diff: 115 lines (+32/-3) (has conflicts)

6 files modified

.pc/applied-patches (+3/-0)
debian/changelog (+11/-0)
debian/patches/series (+3/-0)
juju/charm/tests/test_directory.py (+8/-0)
juju/providers/maas/provider.py (+2/-3)
juju/providers/maas/tests/test_provider.py (+5/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

28. By Clint Byrum on 2012-12-03

d/juju.docs: Remove examples as they have been dropped upstream.

27. By Clint Byrum on 2012-11-06

d/p/maas-tag-conversion.patch: Dropped, patch applied upstream.

26. By Clint Byrum on 2012-11-06

d/p/fix-tests-do-not-use-etc-lsb-release: Dropped, patch applied upstream.

25. By Martin Packman on 2012-10-10

d/patches/maas-tag-conversion.patch: Fix maas provider api usage
of maas-tags constraint. (LP: #1064734)

24. By Clint Byrum <email address hidden> on 2012-10-09

* New upstream release
* d/control: Removing libvirt-bin from Suggests as it is no longer
  needed.

23. By Clint Byrum <email address hidden> on 2012-10-02

New upstream snapshot.

22. By Clint Byrum <email address hidden> on 2012-08-24

* New upstream release
* d/control: build-dep and dep on procps because "kill" is called
  in juju.lib.service

21. By Clint Byrum <email address hidden> on 2012-07-19

* New upstream snapshot
* Use new environment variable to raise test timeout since
  5s may be too low on some buidlds. (LP: #1026714)

20. By Clint Byrum <email address hidden> on 2012-06-30

New upstream release

19. By Clint Byrum <email address hidden> on 2012-06-18

New upstream snapshot