Viewing all changes in revision 307.2.3.
- Committer: j.c.sackett
- Date: 2013-09-10 13:54:39 UTC
- mfrom: (390 charmworld)
- mto: (307.4.2 latency-sparklines)
- mto: This revision was merged to the branch mainline in revision 394.
- Revision ID: jcsackett@canonical.com-20130910135439-7b58fdob5iq7i1hm
Merged in devel.
- files added:
- charmworld/health.py
- charmworld/testing/data/sample_bundle
- files removed:
- charmworld/static/bootstrap-dropdown.js
- charmworld/static/css/bootstrap
- charmworld/static/css/bootstrap/tests
- files renamed:
- migrations/ => charmworld/migrations/
- migrations/versions/001_load_qa_questions.py => charmworld/qa_questions.py *
- files modified:
- .bzrignore
expand all
collapse all
added
removed
charmworld/static/footerbg.png
charmworld/static/headerbg.png
charmworld/static/img/category-app-servers-bw.svg
charmworld/static/img/category-applications-bw.svg
charmworld/static/img/category-cache-proxy-bw.svg
charmworld/static/img/category-databases-bw.svg
charmworld/static/img/category-file-servers-bw.svg
charmworld/static/img/category-misc-bw.svg
charmworld/static/img/charm-app-servers.svg
charmworld/static/img/charm-applications.svg
charmworld/static/img/charm-cache-proxy.svg
charmworld/static/img/charm-databases.svg
charmworld/static/img/charm-file-servers.svg
charmworld/static/img/charm-misc.svg
charmworld/static/img/charm_160.svg
charmworld/static/img/glyphicons-halflings-white.png
charmworld/static/img/glyphicons-halflings.png
charmworld/static/juju.png
charmworld/static/middlebg.png
charmworld/static/pyramid-small.png
charmworld/static/pyramid.png
charmworld/testing/data/sample_bundle/icon.svg
