← Back to branch summary

~stub/charms/trusty/cassandra-tools/devel

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Stuart Bishop
  • Date: 2015-06-29 10:09:24 UTC
  • Revision ID: stuart.bishop@canonical.com-20150629100924-46urmq9wrblo5z1o
Fix Makefile and tests.yaml, now Cassandra 2.1 is the default

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
61
61
        AMULET_TIMEOUT=5400 \
62
62
        $(NOSETESTS) tests.test_integration:Test1UnitDeployment 2>&1 | ts
63
63
        
64
 
21test: unittest Test21Deployment
65
 
Test21Deployment: deps
 
64
20test: unittest Test21Deployment
 
65
Test20Deployment: deps
66
66
        date
67
67
        AMULET_TIMEOUT=5400 \
68
 
        $(NOSETESTS) tests.test_integration:Test21Deployment 2>&1 | ts
 
68
        $(NOSETESTS) tests.test_integration:Test20Deployment 2>&1 | ts
69
69
        
70
70
3test: unittest Test3UnitDeployment
71
71
Test3UnitDeployment: deps