← Back to branch summary

~unity-2d-team/unity-2d/Shell-MultiMonitor

~unity-2d-team/unity-2d/Shell-MultiMonitor

« back to all changes in this revision

Viewing changes to grackle/model.py

Committer: William Grant
Date: 2012-01-22 10:39:15 UTC
Revision ID: william.grant@canonical.com-20120122103915-lqjw4jsaw3ug1q2g

Merge grackle.server into grackle. Alter Makefile to run all the tests.

files renamed:
grackle/server/cassandra.py => grackle/cassandra.py

grackle/server/model.py => grackle/model.py

grackle/server/testing/ => grackle/testing/

grackle/server/tests/test_model.py => grackle/tests/test_model.py

grackle/server/tests/test_wsgi.py => grackle/tests/test_wsgi.py

grackle/server/wsgi.py => grackle/wsgi.py

files modified:
Makefile

grackle-create-instance

grackle/testing/cassandra.py

grackle/tests/__init__.py

Show diffs side-by-side

added added

removed removed

grackle/model.py

28

28

TIME_UUID_TYPE,

29

29

)

30

30

31

from grackle.server.cassandra import workaround_1779

31

from grackle.cassandra import workaround_1779

32

32

33

33

34

34

def create_schema(host, keyspace, clobber=False, create_keyspace=False):

Older »