Update LICENSE & README

diff --git a/LICENSE b/LICENSE
index 86fefdb8f5953dd832e284878bf0635272a2524e..dd5b3a58aa1849f452abc9b5cd1638dc71a5e482 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -172,31 +172,3 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!) The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
-

diff --git a/README b/README
index ad6705df74e122003cc7f305cf72f8938074b630..22e6e5254805499813f9160cb05c091266acdf42 100644 (file)
--- a/README
+++ b/README
@@ -1,16 +1,34 @@
-ceilometer
+puppet-ceilometer
 
 This is the ceilometer module.
 
-License
--------
+About
+-----
 
-Apache License 2.0
+This is currently work in progress. Once finished, this will be uploaded to the puppet forge.
 
 Contact
 -------
 
 techs@enovance.com
 
+License
+-------
+
+Apache License 2.0
+
+   Copyright 2012 eNovance <licensing@enovance>
+
+   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.
+
 
-ONCE FINISHED, THIS MODULE WILL BE IMPLEMENTED ON PUPPET LABS.