Juju Charms Collection
plumgrid-ons package

Merge lp:~bbaqar/charms/bundles/plumgrid-ons/bundle into lp:~plumgrid-team/charms/bundles/plumgrid-ons/bundle

  1. Charm Bundles (0.0)
  2. bundle
  3. Merge into bundle
Proposed by Bilal Baqar
Status: Merged
Merged at revision: 6
Proposed branch: lp:~bbaqar/charms/bundles/plumgrid-ons/bundle
Merge into: lp:~plumgrid-team/charms/bundles/plumgrid-ons/bundle
Diff against target: 65 lines (+10/-6) (has conflicts)
1 file modified
bundle.yaml (+10/-6)
Text conflict in bundle.yaml
To merge this branch: bzr merge lp:~bbaqar/charms/bundles/plumgrid-ons/bundle
Reviewer Review Type Date Requested Status
Bilal Baqar Approve
Review via email: mp+270442@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Bilal Baqar (bbaqar) wrote :

Fix conflicts

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundle.yaml'
2--- bundle.yaml 2015-08-24 20:08:26 +0000
3+++ bundle.yaml 2015-09-08 19:19:10 +0000
4@@ -79,7 +79,11 @@
5 "gui-y": "0"
6 to: 'lxc:plumgrid-director=0'
7 nova-cloud-controller:
8+<<<<<<< TREE
9 charm: cs:~plumgrid-team/trusty/nova-cloud-controller
10+=======
11+ branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
12+>>>>>>> MERGE-SOURCE
13 num_units: 1
14 options:
15 console-access-protocol: novnc
16@@ -118,7 +122,7 @@
17 "gui-y": "-250"
18 to: 'lxc:plumgrid-director=0'
19 neutron-api:
20- charm: cs:~plumgrid-team/trusty/neutron-api
21+ branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
22 num_units: 1
23 options:
24 neutron-plugin: plumgrid
25@@ -132,14 +136,14 @@
26 "gui-y": "0"
27 to: 'lxc:plumgrid-director=0'
28 neutron-api-plumgrid:
29- charm: cs:~plumgrid-team/trusty/neutron-api-plumgrid
30+ charm: cs:trusty/neutron-api-plumgrid
31 options:
32 enable-metadata: True
33 annotations:
34 "gui-x": "750"
35 "gui-y": "250"
36 plumgrid-director:
37- charm: cs:~plumgrid-team/trusty/plumgrid-director
38+ charm: cs:trusty/plumgrid-director
39 num_units: 1
40 options:
41 plumgrid-virtual-ip: 192.168.100.250
42@@ -147,7 +151,7 @@
43 "gui-x": "0"
44 "gui-y": "500"
45 nova-compute:
46- charm: cs:~plumgrid-team/trusty/nova-compute
47+ branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
48 num_units: 1
49 options:
50 enable-live-migration: true
51@@ -160,12 +164,12 @@
52 "gui-y": "250"
53 to: '0'
54 plumgrid-edge:
55- charm: cs:~plumgrid-team/trusty/plumgrid-edge
56+ charm: cs:trusty/plumgrid-edge
57 annotations:
58 "gui-x": "500"
59 "gui-y": "500"
60 plumgrid-gateway:
61- charm: cs:~plumgrid-team/trusty/plumgrid-gateway
62+ charm: cs:trusty/plumgrid-gateway
63 num_units: 1
64 annotations:
65 "gui-x": "-500"

Subscribers

People subscribed via source and target branches

to all changes: