From 11fdd6cadf25493b82d65c1b9f2300a8ddcebbc4 Mon Sep 17 00:00:00 2001
From: Lukas Bezdicka <lbezdick@redhat.com>
Date: Tue, 2 Dec 2014 18:33:27 +0100
Subject: [PATCH] Update xinetd to 0740f5343b54523d9ed27f65c05f6c9f045f022b

0740f5343b54523d9ed27f65c05f6c9f045f022b Merge pull request #38 from apenney/131-release
1bef65eb11a539973e5938f974930f48ffbc913a Prepare 1.3.1 release.
ef81a5bde7d9a53be87681db301ddc3d82d06deb Merge pull request #36 from mhaskel/1.3.0-prep
4e7191ddde8802f44b91b4aab6b656cf0fe2fff6 Prep for 1.3.0 release.
---
 Puppetfile           |  2 +-
 xinetd/.gitignore    |  1 -
 xinetd/CHANGELOG     | 21 +++++++++++++++++++++
 xinetd/Modulefile    |  9 ---------
 xinetd/metadata.json | 20 ++++++++++++++++++++
 5 files changed, 42 insertions(+), 11 deletions(-)
 delete mode 100644 xinetd/Modulefile
 create mode 100644 xinetd/metadata.json

diff --git a/Puppetfile b/Puppetfile
index 6ccf8015e..79550d373 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -175,6 +175,6 @@ mod 'vswitch',
   :git => 'https://github.com/stackforge/puppet-vswitch.git'
 
 mod 'xinetd',
-  :commit => '6b02de8d4f30a819eb404048e4258e3a5e8023c8',
+  :commit => '0740f5343b54523d9ed27f65c05f6c9f045f022b',
   :git => 'https://github.com/puppetlabs/puppetlabs-xinetd.git'
 
diff --git a/xinetd/.gitignore b/xinetd/.gitignore
index 7690901a2..1465c272d 100644
--- a/xinetd/.gitignore
+++ b/xinetd/.gitignore
@@ -1,4 +1,3 @@
-metadata.json
 pkg/
 .DS_Store
 *.swp
diff --git a/xinetd/CHANGELOG b/xinetd/CHANGELOG
index 1d38e378c..7b8dd7de6 100644
--- a/xinetd/CHANGELOG
+++ b/xinetd/CHANGELOG
@@ -1,3 +1,24 @@
+2014-07-15 Release 1.3.1
+
+Summary:
+
+This release merely updates metadata.json so the module can be uninstalled and
+upgraded via the puppet module command.
+
+2014-06-18 Release 1.3.0
+Features:
+- Add 'log_on_success', 'log_on_success_operator' and 'log_on_failure_operator
+parameters to xinetd::service
+- Add 'service_restart', 'service_status', 'service_hasrestart', and
+'service_hasstatus' parameters to class xinetd.
+- Add support for Amazon Linux.
+- License changes to ASLv2
+- Testing and documentation updates.
+
+Bugfixes:
+- Remove duplicated $log_on_failure parameter
+
+
 2013-07-30 Release 1.2.0
 Features:
 - Add `confdir`, `conffile`, `package_name`, and `service_name` parameters to
diff --git a/xinetd/Modulefile b/xinetd/Modulefile
deleted file mode 100644
index 4de185ad5..000000000
--- a/xinetd/Modulefile
+++ /dev/null
@@ -1,9 +0,0 @@
-name    'puppetlabs-xinetd'
-version '1.2.0'
-source  'https://github.com/puppetlabs/puppetlabs-xinetd'
-author  'Puppet Labs'
-license 'Apache License 2.0'
-summary 'Puppet Labs Xinetd Module'
-description 'Puppet module to configure xinetd services'
-project_page 'https://github.com/puppetlabs/puppetlabs-xinetd'
-dependency 'puppetlabs/stdlib', '>= 2.2.1'
diff --git a/xinetd/metadata.json b/xinetd/metadata.json
new file mode 100644
index 000000000..d35677b72
--- /dev/null
+++ b/xinetd/metadata.json
@@ -0,0 +1,20 @@
+{
+  "name": "puppetlabs-xinetd",
+  "version": "1.3.1",
+  "author": "puppetlabs",
+  "summary": "Puppet Labs Xinetd Module",
+  "license": "Apache License, Version 2.0",
+  "source": "https://github.com/puppetlabs/puppetlabs-xinetd",
+  "project_page": "https://github.com/puppetlabs/puppetlabs-xinetd",
+  "issues_url": "https://github.com/puppetlabs/puppetlabs-xinetd/issues",
+  "types": [
+  
+  ],
+  "description": "Puppet module to configure xinetd services",
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">=2.2.1"
+    }
+  ]
+}