summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #170 from rackerjoe/fix-syspanel-image-listdiablo2011.3Gabriel Hurley2011-10-261-2/+2
|\
| * container_format and project_id are flippedJoseph W. Breu2011-10-261-2/+2
|/
* Merge pull request #166 from cloudbuilders/launch_image_cherry_pickTres Henry2011-10-251-3/+4
|\
| * this gives the possibility to have an image launchable :) previous release re...Carlo Truijllo2011-10-251-3/+4
|/
* Merge pull request #161 from gabrielhurley/user_tenant_fixesDevin Carlen2011-10-254-34/+71
|\
| * Fixes for LP bugs 879626, 879633, and 879641.Gabriel Hurley2011-10-244-34/+71
|/
* Merge pull request #141 from cloudbuilders/owner-editable-imagesDevin Carlen2011-10-028-20/+195
|\
| * fixed other nitsJake Dahn2011-09-301-18/+17
| * fixing style nitsJake Dahn2011-09-301-6/+4
| * adding a notice for when there are no images, so the page isnt just blankJake Dahn2011-09-301-1/+6
| * merging masterJake Dahn2011-09-301-33/+31
| * adding delete form to index, so images owned by a user can be deleted by themJake Dahn2011-09-301-2/+32
| * adding edit/delete capability for owner of an image through the user dashboardJake Dahn2011-09-307-6/+151
* | Bumped versionDevin Carlen2011-10-012-11/+6
* | Merge pull request #146 from gabrielhurley/swift_service_typeDevin Carlen2011-10-011-2/+2
|\ \
| * | Fix for issue 863694 on launchpad -- use 'object-store' instead of 'swift' in...Gabriel Hurley2011-09-301-2/+2
| |/
* | Merge pull request #148 from cloudbuilders/fix-tenant-updateDevin Carlen2011-10-012-7/+9
|\ \
| * | fixing tenant update testJake Dahn2011-09-301-4/+5
| * | updating apiJake Dahn2011-09-301-3/+4
| |/
* | Merge pull request #147 from gabrielhurley/nixon_fixDevin Carlen2011-10-013-5/+67
|\ \
| * | Fix w/ tests for LP 844442 -- dash sidebar module loading respects different ...Gabriel Hurley2011-09-304-9/+71
* | | Merge pull request #145 from gabrielhurley/fix_glance_testsDevin Carlen2011-10-011-4/+4
|\ \ \ | |/ / |/| |
| * | Fixes the glance API tests that were reverted by 61c9a75201a89af530db3eeb281a...Gabriel Hurley2011-09-301-4/+4
|/ /
* | Merge pull request #144 from cloudbuilders/update_keystone_admin_portDevin Carlen2011-09-302-2/+2
|\ \ | |/ |/|
| * update admin port for keystoneAnthony Young2011-09-302-2/+2
* | Merge pull request #143 from cloudbuilders/keypair-importJoseph Heck2011-09-307-14/+95
|\ \
| * | fixing pep8 spacingJake Dahn2011-09-291-0/+1
| * | removing useless variable assignmentJake Dahn2011-09-291-3/+1
| * | creating a separate api method for keypair import, and adding a testJake Dahn2011-09-293-6/+23
| * | adding the ability to import an existing public key as a keypairJake Dahn2011-09-296-12/+77
* | | Merge pull request #142 from cloudbuilders/migrate-assetsJoseph Heck2011-09-303-1/+2
|\ \ \ | |/ /
| * | removing slashJake Dahn2011-09-291-1/+1
| * | renaming js file to follow standard convention, re-adding js file to be inclu...Jake Dahn2011-09-292-1/+2
| * | moving chosen assets to the newer location in the static dirJake Dahn2011-09-292-0/+0
| |/
* | Merge pull request #140 from cloudbuilders/remove_admin_hackJoseph Heck2011-09-302-13/+45
|\ \ | |/ |/|
| * Merge remote branch '4p/master' into remove_admin_hackAnthony Young2011-09-293-6/+6
| |\ | |/ |/|
* | Merge pull request #139 from cloudbuilders/glance_type_imageDevin Carlen2011-09-293-6/+6
|\ \
| * | Make dashboard look for a service of type 'image' rather than specifically 'g...Anthony Young2011-09-293-6/+6
|/ /
| * Remove the keystone admin auth hack. Handle condition when no valid tenants ...Anthony Young2011-09-292-13/+45
|/
* Merge pull request #138 from cloudbuilders/userdata-whitespaceDevin Carlen2011-09-291-1/+2
|\
| * adding normalize_newline to userdata box on launch instances formJake Dahn2011-09-281-1/+2
|/
* Merge pull request #137 from cloudbuilders/keystone-roles-errorsJoseph Heck2011-09-283-4/+39
|\
| * adding test for role_add_for_tenant_userJake Dahn2011-09-282-0/+29
| * fixing error which would cause setting of user role to failJake Dahn2011-09-281-4/+10
|/
* Merge pull request #132 from gabrielhurley/log_exceptionDevin Carlen2011-09-2717-93/+72
|\
| * Fixed Bug 849488 -- use log.exception instead of log.error.Gabriel Hurley2011-09-2617-93/+72
* | Merge pull request #135 from cloudbuilders/sec_groups_idsDevin Carlen2011-09-272-4/+0
|\ \
| * | no need to show ids hereJesse Andrews2011-09-272-4/+0
| |/
* | Merge pull request #136 from cloudbuilders/floating_ips_idDevin Carlen2011-09-271-2/+0
|\ \
| * | ids aren't useful here eitherJesse Andrews2011-09-271-2/+0
| |/