Merge branch 'feature/master/move_to_puppetlabs'

* feature/master/move_to_puppetlabs:
  Update README
  Remove metadata.json from the repository
  Rename module from jeffmccune to puppetlabs

5 files changed, 15 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index 01d0a08..42a59a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 pkg/
+metadata.json
diff --git a/Modulefile b/Modulefile
index 54bdc6c..6ecced5 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,11 +1,11 @@
-name    'jeffmccune-ntp'
+name    'puppetlabs-ntp'
 version '1.0.2'
-source 'git://github.com/jeffmccune/jeffmccune-ntp'
+source 'git://github.com/puppetlabs/jeffmccune-ntp'
 author 'Jeff McCune'
 license 'BSD 3-Clause'
 summary 'NTP Module'
 description 'NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL'
-project_page 'http://github.com/jeffmccune/jeffmccune-ntp'
+project_page 'http://github.com/puppetlabs/jeffmccune-ntp'
 
 ## Add dependencies, if any:
 # dependency 'username/name', '>= 1.2.0'
diff --git a/README b/README
deleted file mode 100644
index 66db4e8..0000000
--- a/README
+++ /dev/null
@@ -1,3 +0,0 @@
-ntp
-
-This is the ntp module.
diff --git a/README.markdown b/README.markdown
new file mode 100644
index 0000000..15bac43
--- /dev/null
+++ b/README.markdown
@@ -0,0 +1,11 @@
+# NTP #
+
+Manage the NTP service.
+
+This module has been built and tested using Puppet 2.6.x
+
+# Platforms #
+
+ * Enterprise Linux 5
+ * Ubuntu 10.04 Lucid
+
diff --git a/metadata.json b/metadata.json
deleted file mode 100644
index 8ce7797..0000000
--- a/metadata.json
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-+-----------------------------------------------------------------------+
-|                                                                       |
-|                    ==> DO NOT EDIT THIS FILE! <==                     |
-|                                                                       |
-|   You should edit the `Modulefile` and run `puppet-module build`      |
-|   to generate the `metadata.json` file for your releases.             |
-|                                                                       |
-+-----------------------------------------------------------------------+
-*/
-
-{}