summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixed typoTrey Morris2010-12-231-2/+2
* fixed merge conflictTrey Morris2010-12-23133-3114/+4795
|\
| * Moves implementation specific Openstack API code from the middleware to the d...Cerberus2010-12-2313-144/+247
| |\
| | * One more timeCerberus2010-12-231-1/+1
| | * Pep8 cleanupCerberus2010-12-234-1/+5
| | * Merge from trunkCerberus2010-12-2345-508/+2195
| | |\
| | * | Superfluous images include and added basic routes for shared ip groupsCerberus2010-12-232-2/+19
| | * | And the common moduleCerberus2010-12-221-0/+17
| | * | Accidentally yanked the datetime line in authCerberus2010-12-222-1/+2
| | * | Forgot the copyright infomdietz2010-12-222-1/+34
| | * | Finished moving the middleware layers and fixed the API tests againmdietz2010-12-224-16/+18
| | * | Moved some things for testingCerberus2010-12-223-0/+4
| | * | Abstracted auth and ratelimiting moreCerberus2010-12-223-57/+43
| | * | Merge from trunk and resolved conflictsCerberus2010-12-2259-692/+1118
| | |\ \
| | * | | Minor bug fixCerberus2010-12-222-0/+2
| | * | | Merge from trunkCerberus2010-12-2033-291/+493
| | |\ \ \
| | * \ \ \ All API tests finally passmdietz2010-12-186-56/+90
| | |\ \ \ \
| | * | | | | A few more tweaks to get the OS API tests passingCerberus2010-12-172-2/+4
| | * | | | | Some tweaksCerberus2010-12-172-1/+4
| | * | | | | Merge from trunkCerberus2010-12-1745-1296/+711
| | |\ \ \ \ \
| | * | | | | | Some typo fixesCerberus2010-12-174-7/+7
| | * | | | | | Moved implementation specific stuff from the middleware into their respective...Cerberus2010-12-167-86/+106
| * | | | | | | Trying to remove twisted dependencies, this gets everything working under nos...Eric Day2010-12-2326-293/+120
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merged Monty's branch.Eric Day2010-12-231-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | Added reference in setup.py so that python setup.py test works now.Monty Taylor2010-12-231-0/+1
| | * | | | | | | Merged trunk and resolved conflicts.Eric Day2010-12-2395-1454/+3792
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / /
| * | | | | | | Simplifies and improves ldap schema.Ryan Lane2010-12-236-122/+105
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge from trunk, and resolve conflict with nova/auth/ldapdriver.pyRyan Lane2010-12-22128-3136/+3795
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge from trunkRyan Lane2010-12-2283-1189/+2338
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge from trunkRyan Lane2010-12-1777-2021/+1536
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | * | | | | | | | | Adding back in openssh-lpk schema, as keys will likely be stored in LDAP again.Ryan Lane2010-12-154-0/+31
| | * | | | | | | | | Format fixes and modification of Vish's email address.Ryan Lane2010-12-103-21/+24
| | * | | | | | | | | PEP8 fixesRyan Lane2010-12-081-18/+23
| | * | | | | | | | | Setting the default schema version to the new schemaRyan Lane2010-12-081-1/+1
| | * | | | | | | | | Adding support for choosing a schema version, so that users can more easily m...Ryan Lane2010-12-083-36/+52
| | * | | | | | | | | Removing novaProject from the schema. This change may look odd at first; here...Ryan Lane2010-12-086-31/+12
| | * | | | | | | | | Merge from trunkRyan Lane2010-12-0850-1058/+1543
| | |\| | | | | | | |
| | | * | | | | | | | Merge from trunkRyan Lane2010-12-0811-264/+221
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge from trunkRyan Lane2010-12-081-35/+103
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge from trunkRyan Lane2010-12-0846-835/+1295
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | * Removes unused schemaRyan Lane2010-12-035-65/+17
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | xenapi iscsi support + unittestsArmando Migliaccio2010-12-2315-111/+1369
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ last merge trunk before pushArmando Migliaccio2010-12-232-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | There were a few unclaimed addresses in mailmap.Vishvananda Ishaya2010-12-232-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add Ryan Lane as wellVishvananda Ishaya2010-12-232-2/+2
| | * | | | | | | | | | | | | fix commits from Anthony and Vish that were committed with the wrong emailVishvananda Ishaya2010-12-231-2/+2
| |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | merge trunk, fixed unittests, added i18n strings, cleanups etc etc.Armando Migliaccio2010-12-2349-620/+1432
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fixes reboot (and rescue) to work even if libvirt doesn't know about the inst...Vishvananda Ishaya2010-12-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ merged trunkVishvananda Ishaya2010-12-232-3/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixes reboot (and rescue) to work even if libvirt doesn't know about the inst...Vishvananda Ishaya2010-12-234-71/+5
| |\| | | | | | | | | | | | |