Merge pull request #44 from kbarber/ticket/master/release

Prepare for release 1.2.0

Author: nicklewis

CHANGELOG

@@ -1,3 +1,27 @@
+## puppetlabs-puppetdb changelog
+
+Release notes for the puppetlabs-puppetdb module.
+
+------------------------------------------
+
+#### 1.2.0 - 2013/04/05
+
+This release is primarily about providing full configuration file support in the module for PuppetDB 1.2.0. (The alignment of version is a coincidence I assure you :-).
+
+This feature release adds the following new configuration parameters to the main `puppetdb` class:
+
+* node_ttl
+* node_purge_ttl (available in >=1.2.0)
+* report_ttl
+
+Consult the README for futher details about these new configurable items.
+
+##### Changes
+
+* (Nick Lewis) Add params and ini settings for node/purge/report ttls and document them
+
+------------------------------------------
+
 1.1.5
 =====
 
@@ -11,8 +35,10 @@
 2013-01-17 - Chris Price
  * Improve documentation in init.pp
 
+------------------------------------------
+
 1.1.4
-========
+=====
 
 This is a bugfix release, mostly around fixing backward-compatibility for the
 deprecated `manage_redhat_firewall` parameter.  It wasn't actually entirely
@@ -24,8 +50,10 @@ backwards-compatible in the 1.1.3 release.
 2013-01-16 - Chris Price <chris@puppetlabs.com>
  * Fix deprecation warnings around manage_redhat_firewall (448f8bc)
 
+------------------------------------------
+
 1.1.3
-========
+=====
 
 This is mostly a maintenance release, to update the module dependencies to newer
 versions in preparation for some new features.  This release does include some nice
@@ -49,8 +77,10 @@ submissions!
 2012-11-13 - Drew Blessing <Drew.Blessing@Buckle.com>
  * 17594 - PuppetDB - Add ability to set standard host listen address and open firewall
 
+------------------------------------------
+
 1.1.2
-========
+=====
 
 2012-10-26 - Chris Price <chris@puppetlabs.com> (1.1.2)
  * 1.1.2 release

LICENSE

@@ -0,0 +1,17 @@
+Puppet Firewall Module - Puppet module for managing Firewalls
+
+Copyright (C) 2011-2013 Puppet Labs, Inc.
+
+Puppet Labs can be contacted at: info@puppetlabs.com
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

Modulefile

@@ -1,10 +1,10 @@
 name 'puppetlabs-puppetdb'
-version '1.1.5'
+version '1.2.0'
 source 'git://github.com/puppetlabs-puppet/puppetlabs-puppetdb.git'
 author 'Puppet Labs'
 description 'PuppetDB resource types'
 summary 'PuppetDB resource types'
-license 'Apache'
+license 'ASL 2.0'
 project_page 'https://github.com/puppetlabs-puppet/puppetlabs-puppetdb'
 
 dependency 'cprice404/inifile', '>= 0.9.0'