tree 8ffb52b8ec11d1cbe2abd87cb1d99adeff1267e0
parent 1542c3c1cc7192d74aed3028490312d296a8f32f
parent cc4bf7c8338ca9d30c4f12509245d685cf604300
author Jan Kaufman <j.kaufman@tcpcloud.eu> 1452692795 +0100
committer Jan Kaufman <j.kaufman@tcpcloud.eu> 1452692795 +0100

Merge branch 'rhnetwork' into 'master'

RedHat network support: set default proto: according OS default

'protocol' part of network configuration is different in Debian vs RedHat.

current value 'static' isn't compatible with RedHat OSes see: http://pydoc.net/Python/salt/2014.7.0/salt.modules.rh_ip/ - 'none' should be set instead

See merge request !11