Merge lp:~benji/charms/precise/juju-gui/fix-cache-headers into lp:~charmers/charms/precise/juju-gui/trunk
Proposed by
Benji York
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | Marco Ceppi | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~benji/charms/precise/juju-gui/fix-cache-headers | ||||
Merge into: | lp:~charmers/charms/precise/juju-gui/trunk | ||||
Prerequisite: | lp:~juju-gui/charms/precise/juju-gui/trunk | ||||
Diff against target: |
199 lines (+64/-23) (has conflicts) 6 files modified
HACKING.md (+5/-2) Makefile (+8/-2) config/apache-site.template (+3/-0) hooks/utils.py (+1/-0) revision (+4/-0) tests/20-functional.test (+43/-19) Text conflict in revision |
||||
To merge this branch: | bzr merge lp:~benji/charms/precise/juju-gui/fix-cache-headers | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Francesco Banconi (community) | Approve | ||
Gary Poster (community) | Approve | ||
charmers | Pending | ||
Review via email: mp+177958@code.launchpad.net |
Commit message
Add good cache headers to the GUI when served by Apache.
Description of the change
Add good cache headers to the GUI when served by Apache.
To post a comment you must log in.
Great, thanks Benji! Thanks also for writing the test: that is very cool.
Nice flyby change to Makefile. Nice approach to juju_deploy.
LGTM
Gary