From b7cdc3e7ae9820b5773b468e2da81796a54d0030 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Charlier?= Date: Fri, 7 Dec 2012 12:37:28 +0100 Subject: [PATCH] Update LICENSE & README --- LICENSE | 28 ---------------------------- README | 28 +++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/LICENSE b/LICENSE index 86fefdb..dd5b3a5 100644 --- 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 ad6705d..22e6e52 100644 --- 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 + + 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. -- 2.45.2