← Back to branch summary

~jcsackett/charmworld/bac-tag-constraints

~jcsackett/charmworld/bac-tag-constraints

Viewing all changes in revision 304.5.1.

Committer: Aaron Bentley
Date: 2013-07-18 21:32:20 UTC
mfrom: (315 charmworld)
mto: (304.4.37 support-bundles-2)
mto: This revision was merged to the branch mainline in revision 317.
Revision ID: aaron@canonical.com-20130718213220-bdksn18h7b238s89

Merged trunk into support-bundles-1.

Show diffs side-by-side

added added

removed removed

charmworld/jobs/ingest.py

charmworld/jobs/tests/test_lp.py

charmworld/jobs/tests/test_scan.py

charmworld/models.py

charmworld/search.py

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/testing/factory.py

charmworld/tests/test_models.py

charmworld/views/api.py

charmworld/views/tests/test_api.py

migrations/migrate.py

migrations/versions/tests/test_migrations.py

Older »