Merged trunk
This commit is contained in:
3 changed files with 6 additions and 2 deletions
@@ -151,7 +151,7 @@ class VpnCommands(object):
state = 'up'
print address,
print vpn['host'],
print vpn['ec2_id'],
print ec2utils.id_to_ec2_id(vpn['id']),
print vpn['state_description'],
print state
else:
@@ -406,6 +406,10 @@ def ensure_vlan_forward(public_ip, port, private_ip):
"-d %s -p udp "
"--dport %s -j DNAT --to %s:1194" %
(public_ip, port, private_ip))
iptables_manager.ipv4['nat'].add_rule("OUTPUT",
"-d %s -p udp "
"--dport %s -j DNAT --to %s:1194" %
(public_ip, port, private_ip))
iptables_manager.apply()
@@ -68,7 +68,7 @@ class ProjectTestCase(test.TestCase):
contributors.add(str_dict_replace(email, mailmap))
else:
self.assertTrue(False, 'Cannot read commit history')
return
for contributor in contributors:
if contributor == 'nova-core':
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.