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

Proposed by Francesco Banconi on 2012-02-29
Status: Merged
Approved by: Graham Binns on 2012-02-29
Approved revision: 36
Merged at revision: 36
Proposed branch: lp:~frankban/charms/oneiric/buildbot-master/revision-and-wrapper
Merge into: lp:~yellow/charms/oneiric/buildbot-master/trunk
Diff against target: 42 lines (+2/-23)
3 files modified
.bzrignore (+0/-1)
juju_wrapper (+0/-22)
revision (+2/-0)
To merge this branch: bzr merge lp:~frankban/charms/oneiric/buildbot-master/revision-and-wrapper
Reviewer Review Type Date Requested Status
Graham Binns (community) code 2012-02-29 Approve on 2012-02-29
Review via email: mp+95146@code.launchpad.net

Description of the change

Removed juju_wrapper.
Added revision file.

To post a comment you must log in.
Graham Binns (gmb) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2012-02-02 19:29:41 +0000
+++ .bzrignore 2012-02-29 10:55:24 +0000
@@ -2,4 +2,3 @@
2Session.vim2Session.vim
3tags3tags
4TAGS4TAGS
5revision
65
=== removed file 'juju_wrapper'
--- juju_wrapper 2012-02-07 12:35:06 +0000
+++ juju_wrapper 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
1#!/bin/sh
2
3# Copyright 2012 Canonical Ltd. This software is licensed under the
4# GNU Affero General Public License version 3 (see the file LICENSE).
5
6[ -n "$RESOLVE_TEST_CHARMS" ] || exec /usr/bin/juju $@
7#set -x
8
9CHARM_TEST_REPO=~/juju-charms # <---- Change this.
10
11cmd=$1
12case $cmd in
13deploy)
14 shift
15 charm=$1
16 shift
17 exec /usr/bin/juju deploy --repository $CHARM_TEST_REPO local:$charm $@
18 ;;
19*)
20 exec /usr/bin/juju $@
21 ;;
22esac
230
=== added file 'revision'
--- revision 1970-01-01 00:00:00 +0000
+++ revision 2012-02-29 10:55:24 +0000
@@ -0,0 +1,2 @@
11
2

Subscribers

People subscribed via source and target branches