Juju Charms Collection
terracotta package

Merge lp:~jose/charms/trusty/terracotta/fixes into lp:charms/trusty/terracotta

  1. Trusty Tahr (14.04)
  2. fixes
  3. Merge into trunk
Proposed by José Antonio Rey
Status: Merged
Merged at revision: 8
Proposed branch: lp:~jose/charms/trusty/terracotta/fixes
Merge into: lp:charms/trusty/terracotta
Diff against target: 30 lines (+2/-2)
3 files modified
hooks/terracotta (+1/-0)
metadata.yaml (+1/-1)
revision (+0/-1)
To merge this branch: bzr merge lp:~jose/charms/trusty/terracotta/fixes
Reviewer Review Type Date Requested Status
Matt Bruzek (community) Approve
Review via email: mp+240790@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matt Bruzek (mbruzek) wrote :

Jose,

My local juju environment could not deploy the terracotta charm because of a stale lxc container, with this fix I was able to deploy.

The tests run correctly on my system now, thanks for the fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/terracotta'
2--- hooks/terracotta 2012-05-07 23:32:01 +0000
3+++ hooks/terracotta 2014-11-05 22:30:37 +0000
4@@ -85,6 +85,7 @@
5
6 installPackages()
7 {
8+ apt-get update -qq
9 apt-get -y install wget
10
11 juju-log "Downloading terracotta..."
12
13=== modified file 'metadata.yaml'
14--- metadata.yaml 2014-10-30 00:20:46 +0000
15+++ metadata.yaml 2014-11-05 22:30:37 +0000
16@@ -8,7 +8,7 @@
17 frameworks, including EHCache, Hibernate and Quartz as well as clustering
18 for J2EE containers.
19 tags:
20- - applications
21+ - application_development
22 provides:
23 dso:
24 interface: terracotta
25
26=== removed file 'revision'
27--- revision 2012-05-07 23:32:01 +0000
28+++ revision 1970-01-01 00:00:00 +0000
29@@ -1,1 +0,0 @@
30-3

Subscribers

People subscribed via source and target branches

to all changes: