← Back to branch summary

~stub/charms/trusty/cassandra/fix-diskchecks

~stub/charms/trusty/cassandra/fix-diskchecks

Viewing all changes in revision 372.

Committer: Stuart Bishop
Date: 2016-03-17 11:07:22 UTC
mfrom: (369.1.3 cassandra)
Revision ID: stuart.bishop@canonical.com-20160317110722-yr1d6dus3udlmyhl

Merge trunk, resolve conflicts

files modified:
Makefile

README.md

config.yaml

hooks/actions.py

hooks/helpers.py

hooks/hooks.py

tests/test_actions.py

tests/test_helpers.py

tests/test_integration.py

tests/tests.yaml

Show diffs side-by-side

added added

removed removed

hooks/actions.py

hooks/helpers.py

tests/test_actions.py

tests/test_helpers.py

tests/test_integration.py

tests/tests.yaml

Older »