charmworld

Merge lp:~benji/charmworld/fix-dependencies into lp:~juju-jitsu/charmworld/trunk

  1. fix-dependencies
  2. Merge into trunk
Proposed by Benji York
Status: Merged
Approved by: Benji York
Approved revision: 318
Merged at revision: 319
Proposed branch: lp:~benji/charmworld/fix-dependencies
Merge into: lp:~juju-jitsu/charmworld/trunk
Diff against target: 30 lines (+4/-1)
1 file modified
requirements.txt (+4/-1)
To merge this branch: bzr merge lp:~benji/charmworld/fix-dependencies
Reviewer Review Type Date Requested Status
Benji York (community) code Approve
Review via email: mp+175835@code.launchpad.net

Commit message

add dependencies for juju-deployer and its dependencies

Description of the change

Herein we do unbreak the trunk by specifying and providing recently added dependencies.

To post a comment you must log in.
Revision history for this message
Benji York (benji) wrote :

Self-reviewing along with Aaron's eyes.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'requirements.txt'
2--- requirements.txt 2013-07-10 21:11:18 +0000
3+++ requirements.txt 2013-07-19 13:57:24 +0000
4@@ -6,8 +6,8 @@
5 colander==0.9.9
6 configobj==4.7.2
7 deform==0.9.5
8+distribute==0.6.35
9 docutils==0.9.1
10-distribute==0.6.35
11 flake8==1.6.2
12 gunicorn==0.17.2
13 httmock==1.0
14@@ -15,6 +15,8 @@
15 ipdb==0.6.1
16 ipython==0.12
17 Jinja2==2.6
18+juju-deployer==0.1.1-cw1
19+jujuclient==0.0.5
20 keyring==1.0-notestrunner1
21 launchpadlib==1.10.2
22 lazr.authentication==0.1.2
23@@ -59,6 +61,7 @@
24 venusian==1.0a7
25 wadllib==1.3.1
26 WebHelpers==1.3
27+websocket-client==0.11.0
28 WebOb==1.2.3
29 WebTest==1.4.3
30 wsgi-intercept==0.5.1

Subscribers

People subscribed via source and target branches