summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge "Sync small and safe changes from oslo"Jenkins2013-05-0114-25/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Sync small and safe changes from osloMatthew Sherborne2013-05-0114-25/+22
* | | | | | | | | | | | | Merge "Sync jsonutils from oslo"Jenkins2013-05-011-16/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Sync jsonutils from osloStanislaw Pitucha2013-05-011-16/+42
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Update to using oslo periodic tasks implementation."Jenkins2013-05-017-364/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update to using oslo periodic tasks implementation.Michael Still2013-05-017-364/+30
* | | | | | | | | | | | | Merge "Fix baremetal get_available_nodes"Jenkins2013-05-012-30/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix baremetal get_available_nodesDevananda van der Veen2013-04-302-30/+2
* | | | | | | | | | | | | Merge "Convert the cache key from unicode to a string."Jenkins2013-05-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Convert the cache key from unicode to a string.Dan Florea2013-04-301-0/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Catch glance image create exceptions"Jenkins2013-05-014-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Catch glance image create exceptionsChris Yeoh2013-05-014-2/+23
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge "Import oslo periodic tasks support."Jenkins2013-05-012-0/+188
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | / / / / / / / / | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Import oslo periodic tasks support.Michael Still2013-05-012-0/+188
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "import and install gettext in vm_vdi_cleaner.py"Jenkins2013-05-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | import and install gettext in vm_vdi_cleaner.pyAndrew Laski2013-04-301-0/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge "Add delete_net_interface function"Jenkins2013-05-011-37/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add delete_net_interface functionEdgar Magana2013-04-291-37/+17
* | | | | | | | | | | Merge "Fix attach when running as root without sysfsutils"Jenkins2013-04-301-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix attach when running as root without sysfsutilsWalter A. Boring IV2013-04-301-0/+11
* | | | | | | | | | | Merge "Add the availability_zone to the volume.usage notifications"Jenkins2013-04-3010-15/+105
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Add the availability_zone to the volume.usage notificationsMichael Kerrin2013-04-3010-15/+105
* | | | | | | | | | | Merge "Small whitespace tweak."Jenkins2013-04-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Small whitespace tweak.Michael Still2013-04-301-1/+1
* | | | | | | | | | | | Merge "Kill off usage of locals() in the filter_scheduler."Jenkins2013-04-301-10/+18
|\| | | | | | | | | | | | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Kill off usage of locals() in the filter_scheduler.Michael Still2013-04-301-10/+18
* | | | | | | | | | | Merge "Remove local variable only used in logging."Jenkins2013-04-301-3/+2
|\| | | | | | | | | |
| * | | | | | | | | | Remove local variable only used in logging.Michael Still2013-04-301-3/+2
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Performance optimization for contrib.flavorextraspecs"Jenkins2013-04-305-10/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Performance optimization for contrib.flavorextraspecsBoris Pavlovic2013-04-305-10/+39
| |/ / / / / / / / /
* | | | | | | | | | Merge "Create instance with deleting image"Jenkins2013-04-302-0/+40
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Create instance with deleting imageMatthew Sherborne2013-04-302-0/+40
* | | | | | | | | | Merge "Update NovaBase model per changes on oslo.db.sqlalchemy"Jenkins2013-04-304-37/+70
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update NovaBase model per changes on oslo.db.sqlalchemyZhongyue Luo2013-04-274-37/+70
* | | | | | | | | | Merge "Refactor work with db.instance_type_* methods"Jenkins2013-04-291-95/+81
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor work with db.instance_type_* methodsBoris Pavlovic2013-04-291-95/+81
* | | | | | | | | | | Merge "Destroy conntrack table on source host during migration"Jenkins2013-04-295-0/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Destroy conntrack table on source host during migrationAnte Karamatic2013-04-265-0/+30
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Fix VMware Hyper console url parameter error."Jenkins2013-04-292-2/+29
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix VMware Hyper console url parameter error.Yaguang Tang2013-04-272-2/+29
* | | | | | | | | | | Merge "ec2 CreateVolumes/DescribeVolumes status mapping"Jenkins2013-04-292-1/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ec2 CreateVolumes/DescribeVolumes status mappingChris Yeoh2013-04-222-1/+35
* | | | | | | | | | | | Merge "Fix ec2 CreateVolumes/DescribeVolumes status"Jenkins2013-04-292-8/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Fix ec2 CreateVolumes/DescribeVolumes statusChris Yeoh2013-04-192-8/+1
* | | | | | | | | | | | Merge "Adds tests for isolated_hosts_filter"Jenkins2013-04-292-35/+63
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Adds tests for isolated_hosts_filterMatthew Sherborne2013-04-262-35/+63
* | | | | | | | | | | | Merge "Fix up regression tester"Jenkins2013-04-291-64/+92
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix up regression testerJoe Gordon2013-04-171-64/+92
* | | | | | | | | | | | | Merge "Fixes race condition of deleting floating ip"Jenkins2013-04-292-5/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixes race condition of deleting floating ipWangpan2013-04-262-5/+31