summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge "Change Docker resource mapping name"Jenkins2014-02-242-4/+4
|\
| * Change Docker resource mapping nameRichard Lee2014-02-212-4/+4
* | Merge "Fix resource mapping for Docker"Jenkins2014-02-241-5/+8
|\ \ | |/
| * Fix resource mapping for DockerAnderson Mesquita2014-02-211-5/+8
* | Fix test for cloud loadbalancerSergey Kraynev2014-02-211-3/+2
|/
* Merge "Rackspace Cloud Networks resource"Jenkins2014-02-213-2/+273
|\
| * Rackspace Cloud Networks resourceRandall Burt2014-02-203-2/+273
* | Merge "Fix resource mapping for Rackspace"Jenkins2014-02-215-27/+50
|\ \
| * | Fix resource mapping for RackspaceAnderson Mesquita2014-02-205-27/+50
| |/
* | Merge "Add a requirements file for contrib/rackspace/"Jenkins2014-02-211-0/+2
|\ \ | |/ |/|
| * Add a requirements file for contrib/rackspace/Angus Salkeld2014-02-111-0/+2
* | Merge "Native Nova Server compatibility for Cloud Server"Jenkins2014-02-182-681/+610
|\ \
| * | Native Nova Server compatibility for Cloud ServerJason Dunsmore2014-02-132-681/+610
* | | Merge "Rename Openstack to OpenStack"Jenkins2014-02-171-3/+3
|\ \ \
| * | | Rename Openstack to OpenStacktanlin2014-02-131-3/+3
* | | | Merge "Restructure Marconi plugin directory structure"Jenkins2014-02-163-1/+1
|\ \ \ \
| * | | | Restructure Marconi plugin directory structureAnderson Mesquita2014-02-113-1/+1
* | | | | Merge "Separate the Marconi client from the resource"Jenkins2014-02-163-42/+61
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Separate the Marconi client from the resourceRichard Lee2014-02-113-42/+61
| | |/ | |/|
* | | Merge "Improve help strings"Jenkins2014-02-131-1/+1
|\ \ \
| * | | Improve help stringsAndreas Jaeger2014-02-121-1/+1
* | | | Merge "Delete rackspace database resource"Jenkins2014-02-132-500/+0
|\ \ \ \
| * | | | Delete rackspace database resourceVijendar Komalla2014-02-102-500/+0
* | | | | Merge "Provide region_name to trove-client"Jenkins2014-02-131-1/+6
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Provide region_name to trove-clientVijendar Komalla2014-02-101-1/+6
| | |/ | |/|
* | | Merge "Fix misspellings in heat"Jenkins2014-02-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix misspellings in heatShane Wang2014-02-111-1/+1
| |/
* | Merge "Rename docker_plugin to docker"Jenkins2014-02-118-0/+0
|\ \
| * | Rename docker_plugin to dockerRichard Lee2014-02-078-0/+0
| |/
* | Rename Marconi plugin packageAnderson Mesquita2014-02-077-0/+0
|/
* Merge "Reorganize docker-plugin for consistency"Jenkins2014-02-078-1/+1
|\
| * Reorganize docker-plugin for consistencyRichard Lee2014-02-068-1/+1
* | Restructure Rackspace resourcesAnderson Mesquita2014-02-0616-8/+8
|/
* Use a HeatIdentifier instance to create ParametersPablo Andres Fuente2014-01-301-1/+1
* Merge "Marconi message queue resource implementation"Jenkins2014-01-267-0/+430
|\
| * Marconi message queue resource implementationcbjchen@cn.ibm.com2014-01-257-0/+430
* | Merge ""version" section should be required in template"Jenkins2014-01-252-1/+4
|\ \
| * | "version" section should be required in templatehuangtianhua2014-01-242-1/+4
| |/
* | Merge "Fix error in RS Auto Scale properties schema"Jenkins2014-01-242-12/+18
|\ \
| * | Fix error in RS Auto Scale properties schemaJason Dunsmore2014-01-212-12/+18
| |/
* | Merge "Use region for cinder management uri"Jenkins2014-01-241-0/+9
|\ \
| * | Use region for cinder management uriRandall Burt2014-01-141-0/+9
* | | Merge "Refactor heat gate testing contrib support"Jenkins2014-01-242-43/+0
|\ \ \
| * | | Refactor heat gate testing contrib supportJUN JIE NAN2014-01-212-43/+0
| | |/ | |/|
* | | Fix order of arguments in assertEqual (patch 2/2)Pavlo Shchelokovskyy2014-01-195-76/+78
|/ /
* | Merge "Fix comparison with singletons"Jenkins2014-01-175-17/+17
|\ \
| * | Fix comparison with singletonsPavlo Shchelokovskyy2014-01-135-17/+17
| |/
* | Merge "Add _() to rackspace resource strings"Jenkins2014-01-164-35/+40
|\ \
| * | Add _() to rackspace resource stringsVijendar Komalla2014-01-144-35/+40
* | | Merge "Add contrib to py26 and py27 gates"Jenkins2014-01-162-0/+43
|\ \ \