summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Implement Jinja templates for haproxy configfeature/lbaasv2Phillip Toohill2014-11-069-0/+778
* Tests for extension, db and plugin for LBaaS V2Brandon Logan2014-10-287-74/+2471
* Plugin/DB additions for version 2 of LBaaS APIBrandon Logan2014-10-2613-40/+1873
* Merge remote-tracking branch 'origin' into merge-branchKyle Mestery2014-10-24398-35008/+11073
|\
| * Merge "Big Switch: Switch to TLSv1 in server manager"Jenkins2014-10-232-7/+11
| |\
| | * Big Switch: Switch to TLSv1 in server managerKevin Benton2014-10-222-7/+11
| * | Merge "Remove duplicate import of constants module"Jenkins2014-10-232-9/+6
| |\ \
| | * | Remove duplicate import of constants moduleAngus Lees2014-10-212-9/+6
| * | | Merge "Ensure ofagent unit tests handles random hashseeds"Jenkins2014-10-232-5/+9
| |\ \ \
| | * | | Ensure ofagent unit tests handles random hashseedsBradley Jones2014-10-202-5/+9
| * | | | Merge "Move disabling of metadata and ipv6_ra to _destroy_router_namespace"Jenkins2014-10-233-12/+7
| |\ \ \ \
| | * | | | Move disabling of metadata and ipv6_ra to _destroy_router_namespaceCarl Baldwin2014-10-213-12/+7
| * | | | | Merge "Work toward Python 3.4 support and testing"Jenkins2014-10-221-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Work toward Python 3.4 support and testingJeremy Stanley2014-09-031-1/+1
| * | | | | Merge "Remove superfluous except/re-raise"Jenkins2014-10-221-9/+7
| |\ \ \ \ \
| | * | | | | Remove superfluous except/re-raiseAngus Lees2014-10-201-9/+7
| | | |_|_|/ | | |/| | |
| * | | | | Imported Translations from TransifexOpenStack Proposal Bot2014-10-2217-1359/+2252
| * | | | | Merge "Fix race condition on processing DVR floating IPs"Jenkins2014-10-222-11/+59
| |\ \ \ \ \
| | * | | | | Fix race condition on processing DVR floating IPsrajeev2014-10-202-11/+59
| * | | | | | Merge "Remove redundant initialization and check from DVR RPC mixin"Jenkins2014-10-221-5/+0
| |\ \ \ \ \ \
| | * | | | | | Remove redundant initialization and check from DVR RPC mixinarmando-migliaccio2014-10-191-5/+0
| | | |/ / / / | | |/| | | |
| * | | | | | Merge "Improve performance of security group DB query"Jenkins2014-10-221-12/+18
| |\ \ \ \ \ \
| | * | | | | | Improve performance of security group DB queryKevin Benton2014-10-171-12/+18
| | |/ / / / /
| * | | | | | Merge "Cisco N1kv: Fix update network profile for add tenants"Jenkins2014-10-222-9/+34
| |\ \ \ \ \ \
| | * | | | | | Cisco N1kv: Fix update network profile for add tenantsAbhishek Raut2014-10-162-11/+36
| * | | | | | | Merge "Moves the HA resource creations outside of transaction"Jenkins2014-10-223-39/+48
| |\ \ \ \ \ \ \
| | * | | | | | | Moves the HA resource creations outside of transactionSylvain Afchain2014-10-203-39/+48
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge "Updated from global requirements"Jenkins2014-10-221-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Updated from global requirementsOpenStack Proposal Bot2014-10-211-1/+1
| * | | | | | | Merge "Check for VPN Objects when deleting interfaces"Jenkins2014-10-214-0/+71
| |\ \ \ \ \ \ \
| | * | | | | | | Check for VPN Objects when deleting interfacesvikas2014-10-134-0/+71
| * | | | | | | | Merge "Modify docstring on send_delete_port_request in N1kv plugin"Jenkins2014-10-211-2/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Modify docstring on send_delete_port_request in N1kv pluginPeng Xiao2014-10-201-2/+1
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge "mock.assert_called_once() is not a valid method"Jenkins2014-10-218-29/+68
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | mock.assert_called_once() is not a valid methodJacek Swiderski2014-10-138-29/+68
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge "Updated cache module and its dependencies"Jenkins2014-10-214-125/+136
| |\ \ \ \ \ \ \
| | * | | | | | | Updated cache module and its dependenciesIhar Hrachyshka2014-10-174-125/+136
| * | | | | | | | Merge "Updated service.py and its dependencies"Jenkins2014-10-215-41/+56
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Updated service.py and its dependenciesIhar Hrachyshka2014-10-175-41/+56
| * | | | | | | | Merge "Empty files should not contain copyright or license"Jenkins2014-10-20130-1757/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Empty files should not contain copyright or licenseWeidong Shao2014-10-20130-1757/+1
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge "ofagent: Ignore unknown l2pop entry removals"Jenkins2014-10-202-1/+23
| |\ \ \ \ \ \ \
| | * | | | | | | ofagent: Ignore unknown l2pop entry removalsYAMAMOTO Takashi2014-09-162-1/+23
| * | | | | | | | Merge "Compare subnet length as well when deleting DHCP entry"Jenkins2014-10-202-6/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Compare subnet length as well when deleting DHCP entryAngus Lees2014-10-122-6/+11
| * | | | | | | | | Merge "Drop sslutils and versionutils modules"Jenkins2014-10-202-149/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Drop sslutils and versionutils modulesIhar Hrachyshka2014-10-103-248/+0
| * | | | | | | | | | Merge "ofagent: Drop log level of tenant-triggerable events"Jenkins2014-10-201-6/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | ofagent: Drop log level of tenant-triggerable eventsYAMAMOTO Takashi2014-09-221-6/+6
| * | | | | | | | | | | Merge "Updated fileutils and its dependencies"Jenkins2014-10-205-117/+131
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |