← Back to branch summary

~whitmo/cloudfoundry/reconciler

~whitmo/cloudfoundry/reconciler

Viewing all changes in revision 143.

Committer: Whit Morriss
Date: 2014-10-20 21:48:10 UTC
mfrom: (142.1.6 reconciler-ui)
Revision ID: whit.morriss@canonical.com-20141020214810-rn05b3z12jachor6

merge

files modified:
reconciler/app.py

reconciler/strategy.py

reconciler/ui/app.py

reconciler/ui/static/main.js

templates/reconciler-upstart.conf

tests/test_strategy.py

tests/test_tactics.py

Show diffs side-by-side

added added

removed removed

reconciler/app.py

reconciler/strategy.py

reconciler/ui/app.py

reconciler/ui/static/main.js

templates/reconciler-upstart.conf

tests/test_strategy.py

tests/test_tactics.py

Older »