summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge with trunk.Soren Hansen2010-07-151-56/+116
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | update spacingJesse Andrews2010-06-201-14/+14
| | * | | | first go at moving from tornado to twistedJesse Andrews2010-06-151-55/+114
| | * | | | implement image serving in objectstore so nginx isn't required in developmentJesse Andrews2010-06-122-0/+30
| | | | * | merged in trunk and fixed import merge errorsVishvananda Ishaya2010-07-1863-196/+122
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Minor post-merge fixesTodd Willey2010-07-162-14/+21
|\ \ \ \ \ \
| * | | | | | Fixes things that were not quite right after big merge party.Todd Willey2010-07-162-14/+21
| |/ / / / /
* | | | | | Fixed _redis_name and _redis_keyJustin Santa Barbara2010-07-161-2/+2
|\ \ \ \ \ \
| * | | | | | _redis_name wasn't picking up override_type correctly, and _redis_key wasn't ...Justin Santa Barbara2010-07-161-2/+2
| |/ / / / /
* | | | | | Add build_sphinx support.Monty Taylor2010-07-163-2/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Added a config file to let setup.py drive building the sphinx docs.Monty Taylor2010-07-163-2/+8
|/ / / / /
* | | | | Merge lp:~anotherjesse/nova/remove-vendorSoren Hansen2010-07-1659-177/+91
|\ \ \ \ \
| * | | | | reorder imports spacingJesse Andrews2010-07-1551-142/+83
| * | | | | remove import of vendor since we have PPA nowJesse Andrews2010-07-1544-69/+42
| | |_|/ / | |/| | |
* | | | | Merge lp:~vishvananda/nova/remove-printSoren Hansen2010-07-161-2/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | no more print in storage unittestVishvananda Ishaya2010-07-151-2/+0
|/ / / /
| | | * Fixes to dhcp lease code to use a flagfileVishvananda Ishaya2010-07-1510-34/+49
| |_|/ |/| |
* | | 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