ubuntu/+source/juju:applied/ubuntu/trusty

Last commit made on 2013-08-23
Get this branch:
git clone -b applied/ubuntu/trusty https://git.launchpad.net/ubuntu/+source/juju
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/trusty
Repository:
lp:ubuntu/+source/juju

Recent commits

0ae5dfb... by James Page on 2013-08-23

Import patches-applied version 0.7-0ubuntu2 to applied/ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 058826b2ca5e29225692a91b55eba8dd8c8bd4b3
Unapplied parent: 458d1c648536c380949decfdaa7e21d20dd9bcbb

New changelog entries:
  * Re-introduce juju 0.7 package to saucy to support use with pre
    juju 1.11 environments (LP: #1200878):
    - d/control: Drop juju package; this is now owned by juju-core.
  * d/patches/juju-0.7-head.patch: Resync 0.7 release with head of
    upstream 0.7 branch.
  * d/patches/workaround-lxc-python-env.patch: Dropped, included in
    resync with upstream 0.7 branch.
  * d/rules,juju.docs->juju.docs.in: Put documentation into the juju-0.7
    package.

458d1c6... by James Page on 2013-08-23

Sync patch with lp:juju/0.7@r633

Gbp-Pq: juju-0.7-head.patch.

db345e7... by James Page on 2013-08-23

test fails on buildds. Apparently a race condition in the test

Gbp-Pq: disable-failing-zookeeper-test.patch.

504e3c4... by James Page on 2013-08-23

Import patches-unapplied version 0.7-0ubuntu2 to ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 8fd935b5e5c085ff520f5d0b40d0fe5af045ecf5

New changelog entries:
  * Re-introduce juju 0.7 package to saucy to support use with pre
    juju 1.11 environments (LP: #1200878):
    - d/control: Drop juju package; this is now owned by juju-core.
  * d/patches/juju-0.7-head.patch: Resync 0.7 release with head of
    upstream 0.7 branch.
  * d/patches/workaround-lxc-python-env.patch: Dropped, included in
    resync with upstream 0.7 branch.
  * d/rules,juju.docs->juju.docs.in: Put documentation into the juju-0.7
    package.

058826b... by Martin Packman on 2013-04-10

Import patches-applied version 0.7-0ubuntu1 to applied/ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: e5c8cd3c57c5466a92c911a557052706b64ea32a
Unapplied parent: ee0bba1740d29e1089521802cd066a5c5b43f7fb

New changelog entries:
  [ Clint Byrum ]
  * d/p/fix-tests-do-not-use-etc-lsb-release: Dropped, patch applied upstream.
  * d/p/maas-tag-conversion.patch: Dropped, patch applied upstream.
  * d/juju.docs: Remove examples as they have been dropped upstream.
  [ Mark Mims ]
  * Add postinst and prerm scripts using update-alternatives to install into
    a versioned location, enabling co-installability with the go juju port.
  [ Martin Packman ]
  * New upstream release. (lp: #1167921)
  * d/p/workaround-lxc-python-env.patch: Workaround regression with local
    provider failing with SyntaxError on running lxc scripts when user has
    Python 3 specific environment variables set. (lp: #1130809)

8fd935b... by Martin Packman on 2013-04-10

Import patches-unapplied version 0.7-0ubuntu1 to ubuntu/raring-proposed

Imported using git-ubuntu import.

Changelog parent: d5a54865e1d2c34e786f4d1bcf00b5a4d6e7873a

New changelog entries:
  [ Clint Byrum ]
  * d/p/fix-tests-do-not-use-etc-lsb-release: Dropped, patch applied upstream.
  * d/p/maas-tag-conversion.patch: Dropped, patch applied upstream.
  * d/juju.docs: Remove examples as they have been dropped upstream.
  [ Mark Mims ]
  * Add postinst and prerm scripts using update-alternatives to install into
    a versioned location, enabling co-installability with the go juju port.
  [ Martin Packman ]
  * New upstream release. (lp: #1167921)
  * d/p/workaround-lxc-python-env.patch: Workaround regression with local
    provider failing with SyntaxError on running lxc scripts when user has
    Python 3 specific environment variables set. (lp: #1130809)

ee0bba1... by Martin Packman on 2013-04-10

The various lxc scripts installed in /usr/bin are Python 3 only.

Gbp-Pq: workaround-lxc-python-env.patch.

555c82b... by Martin Packman on 2013-04-10

test fails on buildds. Apparently a race condition in the test

Gbp-Pq: disable-failing-zookeeper-test.patch.

e5c8cd3... by Martin Packman on 2012-10-10

Import patches-applied version 0.6-1ubuntu1 to applied/ubuntu/quantal

Imported using git-ubuntu import.

Changelog parent: b4b4d7a8b3080069b9efecb5c511d6335730c025
Unapplied parent: 83409d7ba11c77a1c5cb8c571393864274c81096

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

d5a5486... by Martin Packman on 2012-10-10

Import patches-unapplied version 0.6-1ubuntu1 to ubuntu/quantal

Imported using git-ubuntu import.

Changelog parent: b6f312994ba68055da8a5bb30907fd2e8f97b874

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