More project structure maneuvering.

Rafflecopter · Jul 23, 2013 · 1976aa6 · 1976aa6
1 parent 9413a72
commit 1976aa6
Show file tree

Hide file tree

Showing 359 changed files with 5 additions and 6,358 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,8 @@ nosetests.xml
 # Sublime Text droppings
 *.sublime-project
 *.sublime-workspace
+
+# Deis' config file
+deis/local_settings.py
+venv/
+.vagrant
diff --git a/controller/Makefile → Makefile b/controller/Makefile → Makefile
diff --git a/controller/Procfile → Procfile b/controller/Procfile → Procfile
diff --git a/controller/README.md → README_old.md b/controller/README.md → README_old.md
diff --git a/controller/Vagrantfile → Vagrantfile b/controller/Vagrantfile → Vagrantfile
diff --git a/controller/api/__init__.py → api/__init__.py b/controller/api/__init__.py → api/__init__.py
diff --git a/controller/api/admin.py → api/admin.py b/controller/api/admin.py → api/admin.py
diff --git a/controller/api/fields.py → api/fields.py b/controller/api/fields.py → api/fields.py
diff --git a/controller/api/files/cloud-config-base.yml → api/files/cloud-config-base.yml b/controller/api/files/cloud-config-base.yml → api/files/cloud-config-base.yml
diff --git a/controller/api/fixtures/initial_data.json → api/fixtures/initial_data.json b/controller/api/fixtures/initial_data.json → api/fixtures/initial_data.json
diff --git a/controller/api/fixtures/tests.json → api/fixtures/tests.json b/controller/api/fixtures/tests.json → api/fixtures/tests.json
diff --git a/controller/api/management/__init__.py → api/management/__init__.py b/controller/api/management/__init__.py → api/management/__init__.py
diff --git a/...oller/api/management/commands/__init__.py → api/management/commands/__init__.py b/...oller/api/management/commands/__init__.py → api/management/commands/__init__.py
diff --git a/controller/api/management/commands/client.py → api/management/commands/client.py b/controller/api/management/commands/client.py → api/management/commands/client.py
diff --git a/controller/api/migrations/0001_initial.py → api/migrations/0001_initial.py b/controller/api/migrations/0001_initial.py → api/migrations/0001_initial.py
diff --git a/controller/api/migrations/__init__.py → api/migrations/__init__.py b/controller/api/migrations/__init__.py → api/migrations/__init__.py
diff --git a/controller/api/models.py → api/models.py b/controller/api/models.py → api/models.py
diff --git a/controller/api/routers.py → api/routers.py b/controller/api/routers.py → api/routers.py
diff --git a/controller/api/serializers.py → api/serializers.py b/controller/api/serializers.py → api/serializers.py
diff --git a/controller/api/tests/__init__.py → api/tests/__init__.py b/controller/api/tests/__init__.py → api/tests/__init__.py
diff --git a/controller/api/tests/auth.py → api/tests/auth.py b/controller/api/tests/auth.py → api/tests/auth.py
diff --git a/controller/api/tests/backend.py → api/tests/backend.py b/controller/api/tests/backend.py → api/tests/backend.py
diff --git a/controller/api/tests/build.py → api/tests/build.py b/controller/api/tests/build.py → api/tests/build.py
diff --git a/controller/api/tests/config.py → api/tests/config.py b/controller/api/tests/config.py → api/tests/config.py
diff --git a/controller/api/tests/container.py → api/tests/container.py b/controller/api/tests/container.py → api/tests/container.py
diff --git a/controller/api/tests/flavor.py → api/tests/flavor.py b/controller/api/tests/flavor.py → api/tests/flavor.py
diff --git a/controller/api/tests/formation.py → api/tests/formation.py b/controller/api/tests/formation.py → api/tests/formation.py
diff --git a/controller/api/tests/key.py → api/tests/key.py b/controller/api/tests/key.py → api/tests/key.py
diff --git a/controller/api/tests/node.py → api/tests/node.py b/controller/api/tests/node.py → api/tests/node.py
diff --git a/controller/api/tests/provider.py → api/tests/provider.py b/controller/api/tests/provider.py → api/tests/provider.py
diff --git a/controller/api/tests/proxy.py → api/tests/proxy.py b/controller/api/tests/proxy.py → api/tests/proxy.py
diff --git a/controller/api/tests/release.py → api/tests/release.py b/controller/api/tests/release.py → api/tests/release.py
diff --git a/controller/api/urls.py → api/urls.py b/controller/api/urls.py → api/urls.py
diff --git a/controller/api/utils.py → api/utils.py b/controller/api/utils.py → api/utils.py
diff --git a/controller/api/views.py → api/views.py b/controller/api/views.py → api/views.py
diff --git a/controller/bin/build-release-run → bin/build-release-run b/controller/bin/build-release-run → bin/build-release-run
diff --git a/controller/celerytasks/__init__.py → celerytasks/__init__.py b/controller/celerytasks/__init__.py → celerytasks/__init__.py
diff --git a/controller/celerytasks/azuresms.py → celerytasks/azuresms.py b/controller/celerytasks/azuresms.py → celerytasks/azuresms.py
diff --git a/controller/celerytasks/chef.py → celerytasks/chef.py b/controller/celerytasks/chef.py → celerytasks/chef.py
diff --git a/controller/celerytasks/chef_mock.py → celerytasks/chef_mock.py b/controller/celerytasks/chef_mock.py → celerytasks/chef_mock.py
diff --git a/controller/celerytasks/chef_rsa.py → celerytasks/chef_rsa.py b/controller/celerytasks/chef_rsa.py → celerytasks/chef_rsa.py
diff --git a/controller/celerytasks/controller.py → celerytasks/controller.py b/controller/celerytasks/controller.py → celerytasks/controller.py
diff --git a/controller/celerytasks/ec2.py → celerytasks/ec2.py b/controller/celerytasks/ec2.py → celerytasks/ec2.py
diff --git a/controller/celerytasks/mock.py → celerytasks/mock.py b/controller/celerytasks/mock.py → celerytasks/mock.py
diff --git a/controller/celerytasks/models.py → celerytasks/models.py b/controller/celerytasks/models.py → celerytasks/models.py
diff --git a/controller/celerytasks/tests/__init__.py → celerytasks/tests/__init__.py b/controller/celerytasks/tests/__init__.py → celerytasks/tests/__init__.py
diff --git a/controller/celerytasks/tests/azuretest.py → celerytasks/tests/azuretest.py b/controller/celerytasks/tests/azuretest.py → celerytasks/tests/azuretest.py
diff --git a/controller/celerytasks/tests/chef.py → celerytasks/tests/chef.py b/controller/celerytasks/tests/chef.py → celerytasks/tests/chef.py
diff --git a/controller/celerytasks/util.py → celerytasks/util.py b/controller/celerytasks/util.py → celerytasks/util.py
diff --git a/chef/.ruby-version b/chef/.ruby-version
diff --git a/chef/Gemfile b/chef/Gemfile
diff --git a/chef/Gemfile.lock b/chef/Gemfile.lock
diff --git a/chef/LICENSE b/chef/LICENSE