summaryrefslogtreecommitdiffstats
path: root/nova/api
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | Merge trunkChuck Short2011-06-133-5/+19
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merged trunkChuck Short2011-06-086-26/+28
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Fix merge conflictChuck Short2011-06-085-21/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Remove ipy from nova/api/ec2/cloud.py and use netaddrChuck Short2011-06-061-2/+2
* | | | | | | | | | | | | | | trunk mergeTrey Morris2011-06-235-32/+160
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | This adds a way to create global firewall blocks that apply to all instances ...Todd Willey2011-06-231-0/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge Trunk.Todd Willey2011-06-2316-438/+753
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge trunkTodd Willey2011-06-143-8/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Move ipy commands to netaddr.Todd Willey2011-06-141-2/+2
| | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge and resolve.Todd Willey2011-06-1119-175/+231
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trunk.Todd Willey2011-06-0122-357/+873
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge Trunk.Todd Willey2011-05-315-17/+93
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Fixes from Ed Leafe's review suggestions.Todd Willey2011-05-261-7/+4
| | * | | | | | | | | | | | | | | | Double quotes are ugly.Todd Willey2011-05-261-6/+6
| | * | | | | | | | | | | | | | | | Merge trunk.Todd Willey2011-05-2627-227/+790
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trunk.Todd Willey2011-04-0717-41/+72
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | test provider fw rules at the virt/ipteables layer.Todd Willey2011-04-071-3/+3
| | * | | | | | | | | | | | | | | | | | Merge trunk.Todd Willey2011-04-0434-452/+3484
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trunkTodd Willey2011-02-152-7/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trunk.Todd Willey2011-02-013-11/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trunk and make work with provider fw rules (setup alongside basic_rules).Todd Willey2011-01-314-18/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge trunkTodd Willey2011-01-262-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | A couple of bugfixes.Todd Willey2011-01-261-1/+2
| | * | | | | | | | | | | | | | | | | | | | | | | Merge trunk.Todd Willey2011-01-255-29/+61
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | Updates for provider_fw_rules in admin api.Todd Willey2011-01-251-2/+5
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge trunk.Todd Willey2011-01-256-43/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Add provider_fw_rules awareness to iptables firewall driver.Todd Willey2011-01-211-1/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge trunk.Todd Willey2011-01-191-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Whitespace (pep8) cleanups.Todd Willey2011-01-191-1/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Trunk merge.Todd Willey2011-01-181-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Add rules to database, cast refresh message and trickle down to firewall driver.Todd Willey2011-01-171-4/+39
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Stubbed-out code for working with provider-firewalls.Todd Willey2011-01-171-0/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept a full serverRef to OSAPI POST /images (snapshot)Brian Waldon2011-06-232-24/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | adding check for serverRef hostname matching app urlBrian Waldon2011-06-171-5/+11
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | adding extra image service properties to compute api snapshot; adding instanc...Brian Waldon2011-06-172-20/+41
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding dict with single 'meta' key to /imgages/<id>/meta/<key> GET and PUTBrian Waldon2011-06-231-4/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | moving image show/update into 'meta' containerBrian Waldon2011-06-221-4/+11
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | pep8 fixesBrian Waldon2011-06-221-1/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | merging trunkBrian Waldon2011-06-2216-445/+725
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | reverting non-xml changesBrian Waldon2011-06-221-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | adding xml support to /images/<id>/meta resource; moving show/update entities...Brian Waldon2011-06-102-8/+58
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | more trunksTrey Morris2011-06-202-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merging trunk, fixing conflictsRick Harris2011-06-204-93/+175
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merging trunkRick Harris2011-06-178-33/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing private-ips testRick Harris2011-06-151-10/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Adding UUID testRick Harris2011-06-151-1/+2
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | another trunk mergeTrey Morris2011-06-2011-126/+205
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Check that server exists when interacting with /v1.1/servers/<id>/meta resourceBrian Waldon2011-06-201-7/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | moving instance existance logic down to api layerBrian Waldon2011-06-171-18/+29
| | * | | | | | | | | | | | | | | | | | | | | | | | | adding server existence check to server metadata resourceBrian Waldon2011-06-151-1/+14
| | |/ / / / / / / / / / / / / / / / / / / / / / / /