From 3a1e689d8a24baf3cfb5ff894896bba0617d145d Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Wed, 31 Jul 2013 14:04:03 -0400
Subject: Prepare an rc release and add the CHANGELOG.

---
 CHANGELOG  | 30 ++++++++++++++++++++++++++++++
 Modulefile |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index aaeac5b..78c9c18 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,33 @@
+2013-07-31 - Version 2.0.0
+
+Summary:
+
+The 2.0 release focuses on merging all the distro specific
+templates into a single reusable template across all platforms.
+
+To aid in that goal we now allow you to change the driftfile,
+ntp keys, and perferred_servers.
+
+Backwards-incompatible changes:
+
+As all the distro specific templates have been removed and a
+unified one created you may be missing functionality you
+previously relied on.  Please test carefully before rolling
+out globally.
+
+Features:
+- All templates merged into a single template.
+- NTP Keys support added.
+- Add preferred servers support.
+- Parameters in `ntp` class:
+ - `driftfile`: path for the ntp driftfile.
+ - `keys_enable`: Enable NTP keys feature.
+ - `keys_file`: Path for the NTP keys file.
+ - `keys_trusted`: Which keys to trust.
+ - `keys_controlkey`: Which key to use for the control key.
+ - `keys_requestkey`: Which key to use for the request key.
+ - `preferred_servers`: Array of servers to prefer.
+
 2013-07-15 - Version 1.0.1
 Bugfixes:
 - Fix deprecated warning in `autoupdate` parameter.
diff --git a/Modulefile b/Modulefile
index 429501f..9610ef6 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-ntp'
-version '1.0.1'
+version '2.0.0-rc1'
 source 'git://github.com/puppetlabs/puppetlabs-ntp'
 author 'Puppet Labs'
 license 'Apache Version 2.0'
-- 
cgit v1.2.3


From 687bf29601941c088005911d95a4413de00f30ba Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 9 Aug 2013 09:14:59 -0700
Subject: Add `restrict`.

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 78c9c18..e724e6c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@ Features:
  - `keys_controlkey`: Which key to use for the control key.
  - `keys_requestkey`: Which key to use for the request key.
  - `preferred_servers`: Array of servers to prefer.
+ - `restrict`: Array of restriction options to apply.
 
 2013-07-15 - Version 1.0.1
 Bugfixes:
-- 
cgit v1.2.3


From 7b4a3ac9c9e189491ac33898e9c119d5bbfdc124 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 9 Aug 2013 09:43:33 -0700
Subject: Add in parameters that may be effected.

---
 CHANGELOG | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e724e6c..8be6c4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,16 @@ unified one created you may be missing functionality you
 previously relied on.  Please test carefully before rolling
 out globally.
 
+Configuration directives that might possibly be affected:
+- `filegen`
+- `fudge` (for virtual machines)
+- `keys`
+- `logfile`
+- `restrict`
+- `restrictkey`
+- `statistics`
+- `trustedkey`
+
 Features:
 - All templates merged into a single template.
 - NTP Keys support added.
-- 
cgit v1.2.3