summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* _redis_name wasn't picking up override_type correctly, and _redis_key wasn't ...Justin Santa Barbara2010-07-161-2/+2
* This branch fixes some unfortunate interaction between Nova and boto.Soren Hansen2010-07-151-2/+2
|\
| * Make sure we pass str objects instead of unicode objects to boto as our crede...Soren Hansen2010-07-151-2/+2
|/
* Merge with -core's diverged trunk.Soren Hansen2010-07-152-4/+7
|\
| * Updates the test suite to work.Monty Taylor2010-07-153-5/+8
| |\
| | * Disabled a tmpdir cleanup.Monty Taylor2010-07-151-3/+6
| | * Added build-deps to debian/control that are needed to run test suite.Monty Taylor2010-07-142-2/+2
| |/
* | remove vendorTodd Willey2010-07-151765-420366/+1
* | update copyrightsTodd Willey2010-07-15105-308/+148
* | Merge branch 'master' of github.com:angst/ccJoshua McKenty2010-07-149-10/+503
|\ \
| * \ Merge branch 'master' into rackspace_apiTodd Willey2010-07-15161-2519/+7561
| |\ \
| | * | bin to import images from canonical image storeTodd Willey2010-07-151-0/+82
| | * | Merge remote branch 'origin/uec'Todd Willey2010-07-154-10/+81
| | |\ \
| | | * | work on importing imagesJesse Andrews2010-07-144-10/+81
| * | | | More rackspace API.Todd Willey2010-06-213-22/+170
| * | | | git checkpoint commit post-wsgiTodd Willey2010-06-203-229/+88
| * | | | Commit what I have almost working before diverging.Todd Willey2010-06-192-0/+333
* | | | | Volume_ID identifier needed a return in the property. Also looking for race c...Joshua McKenty2010-07-142-3/+13
| |/ / / |/| | |
* | | | add logging import to datastoreTodd Willey2010-07-151-0/+2
* | | | fix merge errorsTodd Willey2010-07-1554-608/+1189
|\ \ \ \
| * | | | change default vpn ports and remove complex vpn ip iterationTodd Willey2010-07-151-16/+11
| * | | | fix reference to BasicModel and importsTodd Willey2010-07-141-4/+4
| * | | | Merge branch 'master' into vpnredisTodd Willey2010-07-1454-581/+1162
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into apply_apiTodd Willey2010-07-1438-201/+733
| | |\ \ \ \
| | | * | | | Updating buildbot addressJoshua McKenty2010-07-141-1/+2
| | | * | | | Fixed buildbotJoshua McKenty2010-07-141-7/+0
| | | * | | | Merge branch 'master' of github.com:angst/ccJoshua McKenty2010-07-142-0/+2
| | | |\ \ \ \
| | | | * | | | Debian package additions for simple network templateVishvananda Ishaya2010-07-142-0/+2
| | | * | | | | SmitemeJoshua McKenty2010-07-141-0/+1
| | | |/ / / /
| | | * | / / SmitemeJoshua McKenty2010-07-141-0/+1
| | | | |/ / | | | |/| |
| | | * | | SmitemeJoshua McKenty2010-07-141-0/+1
| | | * | | SmitemeJoshua McKenty2010-07-141-0/+1
| | | * | | SmitemeJoshua McKenty2010-07-141-0/+1
| | | * | | SmitemeJoshua McKenty2010-07-141-0/+1
| | | * | | FooishJoshua McKenty2010-07-141-0/+1
| | | * | | FooJoshua McKenty2010-07-141-2/+0
| | | * | | FooJoshua McKenty2010-07-141-1/+1
| | | * | | Merge of DHCP changes including dnsmasq callbacksVishvananda Ishaya2010-07-148-49/+254
| | | |\ \ \
| | | | * | | whitespace fixes and header changesVishvananda Ishaya2010-07-072-36/+42
| | | | * | | Fixed the os.environ patch (bogus)Joshua McKenty2010-07-071-1/+1
| | | | * | | Fixes as per Vish review (whitespace, import statements)Joshua McKenty2010-07-072-2/+2
| | | | * | | Off by one error in the allocation test (can someone check my subnet math?)Joshua McKenty2010-07-071-4/+3
| | | | * | | Adding more tests, refactoring for dhcp logic.Joshua McKenty2010-07-071-44/+62
| | | | * | | Got dhcpleasor working, with test ENV for testing, and rpc.cast for real world.Joshua McKenty2010-07-077-29/+91
| | | | * | | Capture signals from dnsmasq and use them to update network state.Joshua McKenty2010-07-076-8/+129
| | | * | | | Merge remote branch 'origin/master'Vishvananda Ishaya2010-07-142-3/+6
| | | |\ \ \ \
| | | | * \ \ \ Merge remote branch 'origin/master'Jesse Andrews2010-07-1425-35/+225
| | | | |\ \ \ \
| | | | | * | | | More buildbot testingJoshua McKenty2010-07-141-1/+1
| | | | | * | | | Merge branch 'master' of github.com:angst/ccJoshua McKenty2010-07-1424-35/+224
| | | | | |\ \ \ \
| | | | | * | | | | More buildbot testingJoshua McKenty2010-07-141-0/+1