From 2dc3dfef6329f1ed38aebd96c077fd1b49044ced Mon Sep 17 00:00:00 2001 From: ran Date: Sun, 7 Jul 2013 15:55:14 +0300 Subject: [PATCH] docfix in win_dns_client and added missing timezone in salt/modules/win_timezone.py --- salt/modules/win_timezone.py | 1 + salt/states/win_dns_client.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/modules/win_timezone.py b/salt/modules/win_timezone.py index 4b42bd873f..38ce929e23 100644 --- a/salt/modules/win_timezone.py +++ b/salt/modules/win_timezone.py @@ -319,6 +319,7 @@ LINTOWIN = { 'Australia/Melbourne': 'AUS Eastern Standard Time', 'CST6CDT': 'Central Standard Time', 'EST5EDT': 'Eastern Standard Time', + 'Etc/UTC': 'UTC', 'Etc/GMT': 'UTC', 'Etc/GMT+1': 'Cape Verde Standard Time', 'Etc/GMT+10': 'Hawaiian Standard Time', diff --git a/salt/states/win_dns_client.py b/salt/states/win_dns_client.py index 51ed46ad8c..ede7b7b10f 100644 --- a/salt/states/win_dns_client.py +++ b/salt/states/win_dns_client.py @@ -17,7 +17,7 @@ def dns_exists(name, servers=None, interface='Local Area Connection'): Example:: config_dns_servers: - network_win.dns_exists: + win_dns_client.dns_exists: - servers: - 8.8.8.8 - 8.8.8.9