summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* manual merge2.6.0Sandy Walsh2011-08-0565-2015/+4803
|\
| * Accidently had a reference to ipgroup still.Brian Lamar2011-08-041-3/+2
| * Merged v1.0 functionality into v1.1 so we don't lose any features by...upgrad...Brian Lamar2011-08-049-105/+613
| * Fix for failing tests because boot response now requests additional information.Brian Lamar2011-08-042-8/+8
| * Merge pull request #1 from bcwaldon/v1.1-formattingBrian Lamar2011-08-043-36/+49
| |\
| | * Merge branch 'v1.1-split-and-support' of http://github.com/blamarvt/python-no...root2011-08-045-17/+16
| | |\ | | |/ | |/|
| * | novaclient -> nova in some documentation as per feedbackBrian Lamar2011-08-042-11/+11
| * | Removed unneeded print.Brian Lamar2011-08-041-1/+0
| * | Change create-image back to image-create, and increased version to 2.6.0Brian Lamar2011-08-043-5/+5
| | * formatting updatesroot2011-08-043-36/+49
| |/
| * Updated --version to default to NOVA_VERSION, quick fix.Brian Lamar2011-08-042-5/+7
| * Updated --version to default to NOVA_VERSIONBrian Lamar2011-08-044-12/+9
| * osc -> novaclientBrian Lamar2011-08-042-11/+11
| * Cleaned up v1.0 and v1.1 test setup to remove globals and encapsulate custom ...Brian Lamar2011-08-045-180/+176
| * Wrong client was getting loaded.Brian Lamar2011-08-031-3/+13
| * Grrrr, bad import.Brian Lamar2011-08-031-1/+1
| * Tests now run correctly for v1.1 and v1.0Brian Lamar2011-08-032-5/+21
| * Updated the default version back to 1.0, as there are some quirks with 1.1Brian Lamar2011-08-031-2/+2
| * Tests working again...merged in some work we did earlier.Brian Lamar2011-08-0352-4017/+3331
| * Split everything down the middle into v1_0 and v1_1, including tests.Brian Lamar2011-08-0353-537/+3423
* | Merge pull request #39 from bcwaldon/masterJosh Kearney2011-07-2916-84/+119
|\ \ | |/ |/|
| * bumping version and updating READMEBrian Waldon2011-07-293-2/+3
| * updating server backup action; pep8 fixesBrian Waldon2011-07-2914-83/+117
|/
* Merge pull request #32 from SandyWalsh/masterJosh Kearney2011-07-131-2/+0
|\
| * removed server dump after add/remove fixed-ipSandy Walsh2011-07-131-2/+0
* | Merge pull request #31 from SandyWalsh/mastercomstud2011-07-128-6/+27
|\ \ | |/
| * version bumpSandy Walsh2011-07-123-2/+9
| * Merge branch 'master' of github.com:rackspace/python-novaclientSandy Walsh2011-07-124-21/+50
| |\ | |/ |/|
* | Merge pull request #30 from comstud/servers-searchSandy Walsh2011-07-122-15/+43
|\ \
| * | added various search options to list command. will need a version bump as i ...Chris Behrens2011-07-122-15/+43
* | | Merge pull request #28 from jerdfelt/masterJosh Kearney2011-07-081-1/+1
|\ \ \
| * | | Clarify description so usage doesn't imply name is the only valid valueJohannes Erdfelt2011-07-071-1/+1
| |/ /
* | | Merge pull request #29 from SandyWalsh/2bba8e2e2b08a53d7dea828047406074826d7622Josh Kearney2011-07-083-3/+41
|\ \ \ | |/ / |/| |
* | | Merge pull request #27 from EdLeafe/mastercomstud2011-07-072-5/+6
|\ \ \
| * | | Added support for request timeouts.Ed Leafe2011-07-072-5/+6
|/ / /
| | * fixed public private ip listSandy Walsh2011-07-124-4/+16
| | * docsSandy Walsh2011-07-081-0/+2
| |/
| * added add/remove fixed_ip actions to serversSandy Walsh2011-07-083-3/+41
|/
* Merge pull request #26 from jk0/masterjerdfelt2011-07-075-0/+29
|\
| * Added migration functionality.Josh Kearney2011-07-075-0/+29
* | Merge pull request #25 from jk0/masterJosh Kearney2011-06-286-22/+40
|\ \ | |/
| * Refactored backup rotation.Josh Kearney2011-06-246-22/+40
* | Merge pull request #23 from jk0/masterSandy Walsh2011-06-246-9/+31
|\ \ | |/
| * Review feedback.Josh Kearney2011-06-241-1/+4
| * Fixed unit tests.Josh Kearney2011-06-243-3/+4
| * Merge branch 'backups'Josh Kearney2011-06-244-6/+24
| |\
| | * Implemented backup with rotation.Josh Kearney2011-06-244-6/+24
* | | Merge pull request #24 from comstud/num-instances-fixesSandy Walsh2011-06-242-3/+11
|\ \ \
| * | | for creating 'x' instances, min_count > max_count check was reversedChris Behrens2011-06-232-3/+11
* | | | Merge pull request #22 from comstud/masterSandy Walsh2011-06-241-0/+7
|\ \ \ \ | |/ / / | | / / | |/ / |/| |