openstack
/
charm-magpie
Code Issues Proposed changes

fixed README.md error

This commit is contained in:
Andrew McLeod 2018-01-10 16:27:47 +01:00
parent 18f15858fd
commit 72a6d94ecc
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@ -82,7 +82,6 @@ This charm also supports the following config values:
type: int
required_mtu:
default: 0
<<<<<<< HEAD
description: |
Desired MTU for all nodes - block if the unit MTU is different
(accounting for encapsulation). 0 disables.
@ -92,14 +91,6 @@ This charm also supports the following config values:
description: |
Minimum transfer speed in mbits/s required to pass the test.
0 disables.
=======
decription: Desired MTU for all nodes - block if the unit MTU is different (accounting for encapsulation). 0 disables.
type: int
min_speed:
default: 0
description: Minimum transfer speed in mbits/s required to pass the test. 0 disables.
>>>>>>> 81c98c029bf014e65b4df5f88f37847903323dee
type: int
```
e.g.