Merge lp:~jjo/ubuntu-api-website/add-api-website-relations into lp:ubuntu-api-website
Status: | Needs review |
---|---|
Proposed branch: | lp:~jjo/ubuntu-api-website/add-api-website-relations |
Merge into: | lp:ubuntu-api-website |
Diff against target: |
629 lines (+540/-0) (has conflicts) 15 files modified
README (+40/-0) config.yaml (+108/-0) hooks/api-website-relation-joined (+9/-0) hooks/common.sh (+83/-0) hooks/config-changed (+56/-0) hooks/db-relation-changed (+45/-0) hooks/install (+76/-0) hooks/nrpe-external-master-relation-changed (+40/-0) hooks/start (+5/-0) hooks/stop (+8/-0) hooks/website-cache-relation-joined (+7/-0) hooks/wsgi-file-relation-changed (+22/-0) metadata.yaml (+19/-0) revision (+1/-0) scripts/check_status_file.sh (+21/-0) Conflict adding file README. Moved existing file to README.moved. |
To merge this branch: | bzr merge lp:~jjo/ubuntu-api-website/add-api-website-relations |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu API Website Developers | 2013-09-26 | Pending | |
Review via email:
|
- 5. By JuanJo Ciarlante on 2013-09-26
-
[jjo, r=mhall119] Add a basic api-website-
relation- {joined, changed} hook, need as per provides (for reverseproxy-like FE services in-front) - requires setting {hostname,port} properly - 6. By JuanJo Ciarlante on 2013-09-30
-
[jjo,r=???] add nagios_context config, change NAGIOS_HOSTNAME to match other deployments ($nagios_
context- $dashed_ unitname)
Unmerged revisions
- 6. By JuanJo Ciarlante on 2013-09-30
-
[jjo,r=???] add nagios_context config, change NAGIOS_HOSTNAME to match other deployments ($nagios_
context- $dashed_ unitname) - 5. By JuanJo Ciarlante on 2013-09-26
-
[jjo, r=mhall119] Add a basic api-website-
relation- {joined, changed} hook, need as per provides (for reverseproxy-like FE services in-front) - requires setting {hostname,port} properly - 4. By Michael Hall on 2013-09-23
-
Version bump to include new search functionality
- 3. By Michael Hall on 2013-09-20
-
Cleanup README
- 2. By Michael Hall on 2013-09-20
-
Fixes and changes
- 1. By Michael Hall on 2013-09-18
-
Initial Juju charm for Canonical IS deployments