Merge lp:~frankban/charms/oneiric/buildbot-slave/revision-and-wrapper into lp:~yellow/charms/oneiric/buildbot-slave/trunk

Proposed by Francesco Banconi
Status: Merged
Approved by: Graham Binns
Approved revision: 16
Merged at revision: 16
Proposed branch: lp:~frankban/charms/oneiric/buildbot-slave/revision-and-wrapper
Merge into: lp:~yellow/charms/oneiric/buildbot-slave/trunk
Diff against target: 44 lines (+6/-24)
3 files modified
.bzrignore (+4/-2)
juju_wrapper (+0/-22)
revision (+2/-0)
To merge this branch: bzr merge lp:~frankban/charms/oneiric/buildbot-slave/revision-and-wrapper
Reviewer Review Type Date Requested Status
Graham Binns (community) code Approve
Review via email: mp+95145@code.launchpad.net

Description of the change

Removed juju_wrapper.
Added revision file.

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-02-08 17:36:53 +0000
3+++ .bzrignore 2012-02-29 10:55:22 +0000
4@@ -1,2 +1,4 @@
5-revision
6-examples
7+.emacs*
8+Session.vim
9+tags
10+TAGS
11
12=== removed file 'juju_wrapper'
13--- juju_wrapper 2012-02-09 15:42:01 +0000
14+++ juju_wrapper 1970-01-01 00:00:00 +0000
15@@ -1,22 +0,0 @@
16-#!/bin/sh
17-
18-# Copyright 2012 Canonical Ltd. This software is licensed under the
19-# GNU Affero General Public License version 3 (see the file LICENSE).
20-
21-[ -n "$RESOLVE_TEST_CHARMS" ] || exec /usr/bin/juju $@
22-#set -x
23-
24-CHARM_TEST_REPO=~/juju-charms # <---- Change this.
25-
26-cmd=$1
27-case $cmd in
28-deploy)
29- shift
30- charm=$1
31- shift
32- exec /usr/bin/juju deploy --repository $CHARM_TEST_REPO local:$charm $@
33- ;;
34-*)
35- exec /usr/bin/juju $@
36- ;;
37-esac
38
39=== added file 'revision'
40--- revision 1970-01-01 00:00:00 +0000
41+++ revision 2012-02-29 10:55:22 +0000
42@@ -0,0 +1,2 @@
43+1
44+

Subscribers

People subscribed via source and target branches