Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/129883
Change subject: Move license text to LICENSE and start README ...................................................................... Move license text to LICENSE and start README Since a README file simply containing a license text is not that great, I moved it out to LICENSE and started a very tiny basic README. Added Guisepee to copyright holders. Assuming he has a joint copyright agreement with Wikimedia Foundation Inc. Change-Id: Iae2c93b458c6bdc023d9fd2f08e40a0056b1d00b --- M compare-puppet-catalogs/LICENSE M compare-puppet-catalogs/README 2 files changed, 29 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software refs/changes/83/129883/1 diff --git a/compare-puppet-catalogs/LICENSE b/compare-puppet-catalogs/LICENSE index 6d276fa..69cd355 100644 --- a/compare-puppet-catalogs/LICENSE +++ b/compare-puppet-catalogs/LICENSE @@ -1 +1,21 @@ -Please see https://www.gnu.org/licenses/gpl-2.0.txt +Compare puppet catalog + +Copyright (c) 2014 Giuseppe Lavagetto +Copyright (c) 2014 Wikimedia Foundation Inc. +Except where explicitly stated in the file header. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Full license is available at https://www.gnu.org/licenses/gpl-2.0.txt diff --git a/compare-puppet-catalogs/README b/compare-puppet-catalogs/README index 00d1592..416e629 100644 --- a/compare-puppet-catalogs/README +++ b/compare-puppet-catalogs/README @@ -1,16 +1,11 @@ -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. +compare-puppet-catalog is a small utility to assist in the migration of your +Puppet manifests from Puppet 2.7 to Puppet 3.0. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +It has several levels of inceptions but should be easily runnable using the +provided Vagrant file: -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + vagrant up -Copyright (c) 2014 Wikimedia Foundation except where explicitly stated in -the file header +== License == + +GPLv2, see file LICENSE. -- To view, visit https://gerrit.wikimedia.org/r/129883 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae2c93b458c6bdc023d9fd2f08e40a0056b1d00b Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
