Merge lp:~corey.bryant/charms/trusty/neutron-openvswitch/fixup-readme into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/trunk

Proposed by Corey Bryant
Status: Needs review
Proposed branch: lp:~corey.bryant/charms/trusty/neutron-openvswitch/fixup-readme
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/trunk
Diff against target: 25 lines (+4/-4)
1 file modified
README.md (+4/-4)
To merge this branch: bzr merge lp:~corey.bryant/charms/trusty/neutron-openvswitch/fixup-readme
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+257377@code.launchpad.net
To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3950 neutron-openvswitch for corey.bryant mp257377
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3950/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #3737 neutron-openvswitch for corey.bryant mp257377
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3737/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #7179 neutron-openvswitch for corey.bryant mp257377
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/7179/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #7767 neutron-openvswitch for corey.bryant mp257377
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/7767/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #11445 neutron-openvswitch for corey.bryant mp257377
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/11445/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #12353 neutron-openvswitch for corey.bryant mp257377
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

LINT Results (max last 2 lines):
make: *** [lint] Error 100
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12895649/
Build: http://10.245.162.77:8080/job/charm_lint_check/12353/

Unmerged revisions

64. By Corey Bryant

Fixup deploy from source README

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 2015-03-21 10:25:07 +0000
3+++ README.md 2015-04-24 13:25:54 +0000
4@@ -46,8 +46,8 @@
5
6 The minimum openstack-origin-git config required to deploy from source is:
7
8- openstack-origin-git:
9- "repositories:
10+ openstack-origin-git:
11+ "repositories:
12 - {name: requirements,
13 repository: 'git://git.openstack.org/openstack/requirements',
14 branch: stable/juno}
15@@ -63,8 +63,8 @@
16
17 The following is a full list of current tip repos (may not be up-to-date):
18
19- openstack-origin-git:
20- "repositories:
21+ openstack-origin-git:
22+ "repositories:
23 - {name: requirements,
24 repository: 'git://git.openstack.org/openstack/requirements',
25 branch: master}

Subscribers

People subscribed via source and target branches