Merge lp:~davidpbritton/charms/precise/block-storage-broker/fix-readme into lp:charms/block-storage-broker

Proposed by David Britton on 2014-07-31
Status: Merged
Merged at revision: 54
Proposed branch: lp:~davidpbritton/charms/precise/block-storage-broker/fix-readme
Merge into: lp:charms/block-storage-broker
Diff against target: 43 lines (+4/-8)
1 file modified
README.md (+4/-8)
To merge this branch: bzr merge lp:~davidpbritton/charms/precise/block-storage-broker/fix-readme
Reviewer Review Type Date Requested Status
Cory Johns Approve on 2014-07-31
Benjamin Saller (community) 2014-07-31 Approve on 2014-07-31
Review via email: mp+229074@code.launchpad.net

Description of the change

Readme contains outdated charm branches that are unnecessary, the cs: urls are fine.

To post a comment you must log in.
Benjamin Saller (bcsaller) wrote :

LGTM +1

review: Approve
Cory Johns (johnsca) wrote :

This seems straightforward and fine to me. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2014-03-27 17:55:57 +0000
3+++ README.md 2014-07-31 16:07:24 +0000
4@@ -39,13 +39,10 @@
5 common:
6 services:
7 postgresql:
8- branch: lp:~chad.smith/charms/precise/postgresql/postgresql-using-storage-subordinate
9+ charm: cs:precise/postgresql
10 constraints: mem=2048
11- options:
12- extra-packages: python-apt postgresql-contrib postgresql-9.1-debversion
13- max_connections: 500
14 storage:
15- branch: lp:~davidpbritton/charms/precise/storage/trunk
16+ charm: cs:precise/storage
17 options:
18 volume_size: 11
19 provider: block-storage-broker
20@@ -55,7 +52,7 @@
21 series: precise
22 services:
23 block-storage-broker:
24- branch: lp:~chad.smith/charms/precise/block-storage-broker/trunk
25+ charm: cs:precise/block-storage-broker
26 options:
27 provider: nova
28 key: <YOUR_OS_USERNAME>
29@@ -66,13 +63,12 @@
30 relations:
31 - ["postgresql", "storage"]
32 - ["storage", "block-storage-broker"]
33-
34 doit-ec2:
35 inherits: common
36 series: precise
37 services:
38 block-storage-broker:
39- branch: lp:~chad.smith/charms/precise/block-storage-broker/trunk
40+ charm: cs:precise/block-storage-broker
41 options:
42 provider: ec2
43 key: <YOUR_EC2_ACCESS_KEY>

Subscribers

People subscribed via source and target branches

to all changes: