Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/storage/secondary/swift
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ def get_container(url, token, container, marker=None, limit=None,
:param marker: marker query
:param limit: limit query
:param prefix: prefix query
:param delimeter: string to delimit the queries on
:param delimiter: string to delimit the queries on
:param http_conn: HTTP connection object (If None, it will create the
conn object)
:param full_listing: if True, return a full listing, else returns a max
Expand Down
2 changes: 1 addition & 1 deletion scripts/vm/hypervisor/xenserver/swift
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def get_container(url, token, container, marker=None, limit=None,
:param marker: marker query
:param limit: limit query
:param prefix: prefix query
:param delimeter: string to delimit the queries on
:param delimiter: string to delimit the queries on
:param http_conn: HTTP connection object (If None, it will create the
conn object)
:param full_listing: if True, return a full listing, else returns a max
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3248,7 +3248,7 @@ public Network updateGuestNetwork(final UpdateNetworkCmd cmd) {
if (NetUtils.isNetworkAWithinNetworkB(network.getCidr(), network.getNetworkCidr())) {
logger.warn(
"Existing IP reservation will become ineffective for the network with id = " + networkId + " You need to reapply reservation after network reimplementation.");
//set cidr to the newtork cidr
//set cidr to the network cidr
network.setCidr(network.getNetworkCidr());
//set networkCidr to null to bring network back to no IP reservation state
network.setNetworkCidr(null);
Expand Down
2 changes: 1 addition & 1 deletion systemvm/debian/etc/vpcdnsmasq.conf
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ expand-hosts
# of valid alternatives, so we will give examples of each. Note that
# IP addresses DO NOT have to be in the range given above, they just
# need to be on the same network. The order of the parameters in these
# do not matter, it's permissble to give name,adddress and MAC in any order
# do not matter, it's permissble to give name,address and MAC in any order

# Always allocate the host with ethernet address 11:22:33:44:55:66
# The IP address 192.168.0.60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def setUpClass(cls):
# Enable Network offering
cls.network_offering_nouserdata.update(cls.api_client, state='Enabled')

# Create Network Offering with all the serices
# Create Network Offering with all the services
cls.network_offering_all = NetworkOffering.create(
cls.api_client,
cls.test_data["isolated_network_offering"]
Expand Down
2 changes: 1 addition & 1 deletion test/integration/smoke/test_migration.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def setUpClass(cls):
cls.network_offering_nouserdata.update(cls.api_client,
state='Enabled')

# Create Network Offering with all the serices
# Create Network Offering with all the services
cls.network_offering_all = NetworkOffering.create(
cls.api_client,
cls.test_data["isolated_network_offering"]
Expand Down
2 changes: 1 addition & 1 deletion test/metadata/func/loadbalancers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1660,7 +1660,7 @@ under the License.
</parameters>
</command>

<!-- Test case 939 - verify that you can assign a load balancer to multipe vms -->
<!-- Test case 939 - verify that you can assign a load balancer to multiple vms -->
<command>
<name>deployVirtualMachine</name>
<testcase> [Deploy a Virtual Machine-1 to check multiple VMs - LB assignment]</testcase>
Expand Down
2 changes: 1 addition & 1 deletion tools/marvin/marvin/lib/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -4877,7 +4877,7 @@ def list(cls, apiclient, **kwargs):


class NetworkServiceProvider:
"""Manage network serivce providers for CloudStack"""
"""Manage network service providers for CloudStack"""

def __init__(self, items):
self.__dict__.update(items)
Expand Down