orange-box-examples

Merge lp:~thomnico/orange-box-examples/telco into lp:orange-box-examples

Proposed by Nicolas Thomas on 2014-10-28

Status:	Merged
Merged at revision:	54
Proposed branch:	lp:~thomnico/orange-box-examples/telco
Merge into:	lp:orange-box-examples
Diff against target:	11 lines (+1/-0) 1 file modified telco/01-deploy.sh (+1/-0)
To merge this branch:	bzr merge lp:~thomnico/orange-box-examples/telco
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Darryl Weaver		2014-10-28	Pending
Review via email: mp+239798@code.launchpad.net

A few minor changes

51. By Darryl Weaver on 2014-10-28: Nicolas Thomas 2014-10-28 Typo
Nicolas Thomas 2014-10-28 demo-prep is now imdempotent
52. By Darryl Weaver on 2014-10-28: Modified Juno deployment to follow final release of charms and Cloud Archive.
53. By Darryl Weaver on 2014-10-28: Nicolas Thomas 2014-10-28 Add a script to enable a local xip.io resolution when uplink dns does not (my case).
54. By Darryl Weaver on 2014-10-28: Nicolas Thomas 2014-10-27 Add a check/force for JUJU_REPOSITORY in case it was set earlier

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'telco/01-deploy.sh'
2	--- telco/01-deploy.sh 2014-10-21 10:16:20 +0000
3	+++ telco/01-deploy.sh 2014-10-28 09:04:03 +0000
4	@@ -10,6 +10,7 @@
5
6	if [[ -d precise/ && -d trusty/ ]]
7	then
8	+ export JUJU_REPOSITORY=$PWD
9	juju-deployer -c bundle-telco.yaml
10	else
11	echo "Run ./bzr-sync-local-charms before running this script"