From 31ffb1afc2b332793a999283e7b3b2bb3aaff35a Mon Sep 17 00:00:00 2001
From: jtimberman <joshua@opscode.com>
Date: Tue, 28 Aug 2012 17:01:57 -0600
Subject: [PATCH] release v1.2.2

---
 CHANGELOG.md |  8 ++++++++
 README.md    | 11 ++++++++++-
 metadata.rb  |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fedc72..0322f6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## v1.2.2:
+
+* [COOK-1442] - Missing ['postfix']['domain'] Attribute causes initial installation failure
+* [COOK-1520] - Add support for procmail delivery
+* [COOK-1528] - Make aliasses template less specific
+* [COOK-1538] - Add iptables_rule template
+* [COOK-1540] - Add smtpd_milters and non_smtpd_milters parameters to main.cf
+
 ## v1.2.0:
 
 * [COOK-880] - add client/server roles for search-based discovery of
diff --git a/README.md b/README.md
index d00d467..86e66e9 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ Requirements
 * RHEL/CentOS/Scientific 5.7+, 6.2+
 * Amazon Linux (as of AMIs created after 4/9/2012)
 
+May work on other platforms with or without modification.
+
 Attributes
 ==========
 
@@ -59,7 +61,14 @@ See `attributes/default.rb` for default values.
   information.
 * `node['postfix']['use_procmail']` - set to true if nodes should use
   procmail as the delivery agent (mailbox_command).
-
+* `node['postfix']['milter_default_action']` - corresponds to the
+  `milter_default_action` option in `/etc/postfix/main.cf`.
+* `node['postfix']['milter_protocol']` - corresponds to the
+  `milter_protocol` option in `/etc/postfix/main.cf`.
+* `node['postfix']['smtpd_milters']` - corresponds to the
+  `smtpd_milters` option in `/etc/postfix/main.cf`.
+* `node['postfix']['non_smtpd_milters']` - corresponds to the
+  `non_smtpd_milters` option in `/etc/postfix/main.cf`.
 
 Recipes
 =======
diff --git a/metadata.rb b/metadata.rb
index 589bf7e..a483d30 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -2,7 +2,7 @@ maintainer        "Opscode, Inc."
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
 description       "Installs and configures postfix for client or outbound relayhost, or to do SASL auth"
-version           "1.2.0"
+version           "1.2.2"
 recipe            "postfix", "Installs and configures postfix"
 recipe            "postfix::sasl_auth", "Set up postfix to auth to a server with sasl"
 recipe            "postfix::aliases", "Manages /etc/aliases"