History | View | Annotate | Download (2.4 kB)
Merge branches api-current and ui-0.4, minor fixes
Merge branches api-current and ui-0.4: * Fix merge conflicts * Fix minor bug in reconciliation mgmt command * Add comments in settings.py.dist * minor PEP8 fixes
Fix Image fixtures, remove size attribute
Fix the fixtures for the Image model, removing referencesto the size attribute, which no longer exists in the Image modelsince commit 838c404d4.
Also fix unloadable fixtures, by removing stray comma charsin JSON.
All VirtualMachine fields are now pubic
Remove non-existent description field
Make owner a not null ForeignKey in VirtualMachine
Make owner a required, not null foreign key in VirtualMachine.Also fix fixtures and the implementation of POST /servers to includea proper owner value (everything gets to be owned by the single SynnefoUser...
Add README.DB, minor fixes to fixtures
Add new file README.DB with instructions for PostgreSQL and MySQL setups.Modify fixtures to include definition of Images in definition of VMs(vms.json), ensuring referential integrity.
Add VirtualMachineMetadata values in fixtures
Split initial_data.json, minor fixes in models.py.
Split initial_data.json into different fixtures, one for each model.Fixtures can be loaded as needed using the loaddata command.See the README for all the details.
Add a complete set of instances for the Flavor model....