Merge lp:~gary/charms/oneiric/buildbot-slave/expand-readme into lp:~yellow/charms/oneiric/buildbot-slave/trunk

Proposed by Gary Poster
Status: Merged
Approved by: Brad Crittenden
Approved revision: 15
Merged at revision: 15
Proposed branch: lp:~gary/charms/oneiric/buildbot-slave/expand-readme
Merge into: lp:~yellow/charms/oneiric/buildbot-slave/trunk
Diff against target: 18 lines (+8/-0)
1 file modified
README.txt (+8/-0)
To merge this branch: bzr merge lp:~gary/charms/oneiric/buildbot-slave/expand-readme
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+95030@code.launchpad.net

Description of the change

This branch adjusts the charm per our recent review: we move HACKING to README.

I also moved the example file to examples, since the review liked that pattern; renamed it to lpbuildbot.yaml to mirror the parallel file on the master side; and added to and massaged the README a bit.

Thank you

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'HACKING.txt' => 'README.txt'
--- HACKING.txt 2012-02-09 15:42:01 +0000
+++ README.txt 2012-02-28 19:41:22 +0000
@@ -1,3 +1,11 @@
1Usage
2=====
3
4This charm expects to work with the buildbot-master charm. Please see
5that charm's README for example usage, and see the examples directory
6in this charm for an example configuration. This charm expects
7configuration to be done primarily at deploy time.
8
1Running the charm tests9Running the charm tests
2=======================10=======================
311
412
=== added directory 'examples'
=== renamed file 'config.setuplxc.yaml' => 'examples/lpbuildbot.yaml'

Subscribers

People subscribed via source and target branches

to all changes: