| commit | e93cc94d5c33a416b95c97e769d3a8d47a488ed8 | [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 | 435766c7d087da2a47026aee9dd95d0608a801fa [diff] | |
| parent | 95697d83842021b123447cbaa0a122abd9ec41cc [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