← Back to branch summary

~abentley/charmworld/remove-store-ingest-job

~abentley/charmworld/remove-store-ingest-job

Viewing all changes in revision 280.

Committer: Aaron Bentley
Date: 2013-06-21 19:39:01 UTC
mfrom: (277.2.2 charmworld)
Revision ID: aaron@canonical.com-20130621193901-v0hgpkosija1rlk7

Merged trunk into refactor-ingest.

files modified:
charmworld/graph.py

charmworld/templates/charm-proof-errors.pt

charmworld/templates/charm.pt

charmworld/templates/config.pt

charmworld/templates/hook.pt

charmworld/templates/interface-collection.pt

charmworld/templates/recent.pt

charmworld/templates/search.pt

charmworld/testing/__init__.py

charmworld/views/__init__.py

charmworld/views/charms.py

charmworld/views/experiment.py

charmworld/views/feeds.py

charmworld/views/tests/test_charms.py

charmworld/views/tests/test_feeds.py

charmworld/views/tests/test_helpers.py

Show diffs side-by-side

added added

removed removed

charmworld/graph.py

charmworld/templates/charm-proof-errors.pt

charmworld/templates/charm.pt

charmworld/templates/config.pt

charmworld/templates/hook.pt

charmworld/templates/interface-collection.pt

charmworld/templates/recent.pt

charmworld/templates/search.pt

charmworld/testing/__init__.py

charmworld/views/__init__.py

charmworld/views/charms.py

charmworld/views/experiment.py

charmworld/views/feeds.py

charmworld/views/tests/test_charms.py

charmworld/views/tests/test_feeds.py

charmworld/views/tests/test_helpers.py

Older »