summaryrefslogtreecommitdiffstats
path: root/nova
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge "Use cfg's new global CONF object"Jenkins2012-05-305-161/+190
|\ \ \ \ \ \
| * | | | | | Use cfg's new global CONF objectMark McLoughlin2012-05-305-161/+190
| | |/ / / / | |/| | | |
* | | | | | Merge "fixing issue with db.volume_update not returning the volume_ref"Jenkins2012-05-304-9/+13
|\ \ \ \ \ \
| * | | | | | fixing issue with db.volume_update not returning the volume_refCraig Vyvial2012-05-304-9/+13
* | | | | | | Merge "Revert "API users should not see deleted flavors.""Jenkins2012-05-302-1/+17
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Revert "API users should not see deleted flavors."Josh Kearney2012-05-292-1/+17
| | |_|/ / / | |/| | | |
* | | | | | Merge "Fix the conf argument to get_connection_pool()."Jenkins2012-05-302-4/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix the conf argument to get_connection_pool().Doug Hellmann2012-05-302-4/+4
* | | | | | Merge "Make xenapi fake match real xenapi a bit closer"Jenkins2012-05-302-5/+7
|\ \ \ \ \ \
| * | | | | | Make xenapi fake match real xenapi a bit closerJohannes Erdfelt2012-05-302-5/+7
* | | | | | | Merge "Align ApiEc2TestCase to closer match api-paste.ini"Jenkins2012-05-301-4/+3
|\ \ \ \ \ \ \
| * | | | | | | Align ApiEc2TestCase to closer match api-paste.iniJoe Gordon2012-05-301-4/+3
* | | | | | | | Merge "Add attach_time for EC2 Volumes"Jenkins2012-05-303-1/+74
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add attach_time for EC2 VolumesChuck Short2012-05-303-1/+74
* | | | | | | | Merge "New RPC tests, docstring fixes."Jenkins2012-05-302-26/+78
|\ \ \ \ \ \ \ \
| * | | | | | | | New RPC tests, docstring fixes.Eric Windisch2012-05-302-26/+78
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge changes I17ca4b69,I9e6ec0d2Jenkins2012-05-304-11/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove nova.log usage from nova.rpc.Russell Bryant2012-05-263-3/+3
| * | | | | | | | Remove nova.context dependency from nova.rpcRussell Bryant2012-05-263-8/+50
* | | | | | | | | Merge "Localize rpc options to rpc code."Jenkins2012-05-303-38/+39
|\| | | | | | | |
| * | | | | | | | Localize rpc options to rpc code.Russell Bryant2012-05-253-38/+39
* | | | | | | | | Merge "Grammar fixes."Jenkins2012-05-3010-20/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Grammar fixes.Matt Joyce2012-05-2910-20/+21
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge "Fix reservation_commit so it works w/ PostgreSQL."Jenkins2012-05-301-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix reservation_commit so it works w/ PostgreSQL.Dan Prince2012-05-301-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "fixes bug 1004153"Jenkins2012-05-302-3/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | fixes bug 1004153Yun Mao2012-05-242-3/+1
* | | | | | | Merge "Remove Deprecated auth from EC2"Jenkins2012-05-301-122/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove Deprecated auth from EC2Joe Gordon2012-05-291-122/+0
| | |/ / / / | |/| | | |
* / | | | | remove dead file nova/tests/db/nova.austin.sqliteYun Mao2012-05-301-0/+0
|/ / / / /
* | | / / Grammar / spelling correctionsMatt Joyce2012-05-298-18/+18
| |_|/ / |/| | |
* | | | Merge "Allow adding fixed IPs by network UUID"Jenkins2012-05-292-3/+39
|\ \ \ \
| * | | | Allow adding fixed IPs by network UUIDMohammed Naser2012-05-252-3/+39
* | | | | Merge "update xen to use network_model"Jenkins2012-05-2920-328/+401
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | update xen to use network_modelTrey Morris2012-05-2420-328/+401
| | |/ / | |/| |
* | | | Merge "_s3_create update only pertinent metadata"Jenkins2012-05-285-26/+105
|\ \ \ \
| * | | | _s3_create update only pertinent metadataJohn Tran2012-05-255-26/+105
* | | | | Merge "clean-up of the bare-metal framework."Jenkins2012-05-273-42/+33
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | clean-up of the bare-metal framework.Armando Migliaccio2012-05-253-42/+33
* | | | | Fix a minor spelling error.Russell Bryant2012-05-251-1/+1
| |_|/ / |/| | |
* | | | Merge "Bugfix in simple_tenant_usage API detail view"Jenkins2012-05-252-5/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Bugfix in simple_tenant_usage API detail viewZhongyue Luo2012-05-252-5/+20
| | |/ | |/|
* | | Merge "Fix XenServer diagnostics to provide correct details"Jenkins2012-05-252-10/+27
|\ \ \
| * | | Fix XenServer diagnostics to provide correct detailsMohammed Naser2012-05-222-10/+27
* | | | Merge "Use utils.utcnow rather than datetime.utcnow"Jenkins2012-05-2512-34/+35
|\ \ \ \
| * | | | Use utils.utcnow rather than datetime.utcnowZhongyue Luo2012-05-2512-34/+35
| | |_|/ | |/| |
* | | | Merge "Expose a limited networks API for users"Jenkins2012-05-254-21/+64
|\ \ \ \
| * | | | Expose a limited networks API for usersMohammed Naser2012-05-244-21/+64
* | | | | Merge "Use cfg's new behavior of reset() clearing overrides"Jenkins2012-05-254-34/+30
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use cfg's new behavior of reset() clearing overridesMark McLoughlin2012-05-214-34/+30