| commit | 59dd0aed279a9f8b67f1b1f36b9cfb1a3cf71134 | [log] [tgz] |
|---|---|---|
| author | Sapan Bhatia <gwsapan@gmail.com> | Mon Sep 22 17:20:53 2014 -0400 |
| committer | Sapan Bhatia <gwsapan@gmail.com> | Mon Sep 22 17:20:53 2014 -0400 |
| tree | 7817bf9693db513e9e01518a61f462cfaa05a212 | |
| parent | f41c5192dbf8b91cd12dd7699783aaffecebcc0a [diff] | |
| parent | 91298a02f4f2c1b3d3059393017819e0838c4e14 [diff] |
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
diff --git a/planetstack/core/models/planetstack.py b/planetstack/core/models/planetstackspecific.py similarity index 100% rename from planetstack/core/models/planetstack.py rename to planetstack/core/models/planetstackspecific.py
diff --git a/planetstack/ec2_observer/__init__.pyc b/planetstack/ec2_observer/__init__.pyc index 0be477a..3d5977d 100644 --- a/planetstack/ec2_observer/__init__.pyc +++ b/planetstack/ec2_observer/__init__.pyc Binary files differ
diff --git a/planetstack/ec2_observer/event_manager.pyc b/planetstack/ec2_observer/event_manager.pyc index a916928..50bb1c8 100644 --- a/planetstack/ec2_observer/event_manager.pyc +++ b/planetstack/ec2_observer/event_manager.pyc Binary files differ