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

Subscribers

People subscribed via source and target branches