Merge branch 'master' into puppet3

This commit is contained in:
Ossi Salmi 2013-05-08 16:35:12 +03:00
commit 17654bb71a
7 changed files with 50 additions and 48 deletions

View file

@ -3,7 +3,8 @@
# === Global variables
#
# $ntp_server:
# Array of NTP servers.
# Array of NTP servers using [] will disable external servers.
# Defaults to pool.ntp.org.
#
# $ntp_client_networks:
# Array of networks that are allowed to query this server in format