Juju Charms Collection
errors package

Merge lp:~lamont/charms/precise/errors/trunk into lp:~daisy-pluckers/charms/precise/errors/trunk

  1. Precise Pangolin (12.04)
  2. trunk
  3. Merge into trunk
Proposed by LaMont Jones
Status: Merged
Merged at revision: 32
Proposed branch: lp:~lamont/charms/precise/errors/trunk
Merge into: lp:~daisy-pluckers/charms/precise/errors/trunk
Diff against target: 25 lines (+2/-2)
2 files modified
config.yaml (+1/-1)
hooks/common (+1/-1)
To merge this branch: bzr merge lp:~lamont/charms/precise/errors/trunk
Reviewer Review Type Date Requested Status
Daisy Pluckers Pending
Review via email: mp+210018@code.launchpad.net

Description of the change

Typo corrections found in deployment.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2013-05-29 11:29:55 +0000
3+++ config.yaml 2014-03-07 21:06:15 +0000
4@@ -68,7 +68,7 @@
5 description: Trust root to use when perfomring openid authentication
6 errors_static_url:
7 type: string
8- default: 'https://assets.ubuntu.com/sites/errors/407'
9+ default: 'https://assets.ubuntu.com/sites/errors/407/'
10 description: Location of static content
11 lp_oauth_token:
12 type: string
13
14=== modified file 'hooks/common'
15--- hooks/common 2013-07-05 11:45:59 +0000
16+++ hooks/common 2014-03-07 21:06:15 +0000
17@@ -20,7 +20,7 @@
18 ERRORS_STATIC_URL="$(config-get errors_static_url)"
19 LP_OAUTH_TOKEN="$(config-get lp_oauth_token)"
20 LP_OAUTH_SECRET="$(config-get lp_oauth_secret)"
21-ERRORS_SECRET_KEY="$(config-get errors_secret_key)"
22+ERRORS_SECRET_KEY="$(config-get errors-secret-key)"
23 DAISY_CODE_DIRS="$(config-get daisy_code_dirs)"
24 ERROR_CODE_DIRS="$(config-get error_code_dirs)"
25 REGION="$(config-get region)"

Subscribers

People subscribed via source and target branches

to all changes: