diff options
| author | Paul Berry <paul@puppetlabs.com> | 2011-01-14 10:15:07 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2011-01-14 10:15:07 -0800 |
| commit | adce308f9892887cc8c8a1c2b3af53e7cd034d51 (patch) | |
| tree | 0f6491b800fa0f952664c33d7f3951010bb0204f | |
| parent | 0b19744c5e01dacaff34e3348b77bcd6297f492e (diff) | |
| parent | 71ac9cfeeda5d41eb95f30e218d383c95c504455 (diff) | |
| download | puppet-adce308f9892887cc8c8a1c2b3af53e7cd034d51.tar.gz puppet-adce308f9892887cc8c8a1c2b3af53e7cd034d51.tar.xz puppet-adce308f9892887cc8c8a1c2b3af53e7cd034d51.zip | |
Merge remote branch 'jamtur01/tickets/2.6.x/5875' into 2.6.next
* jamtur01/tickets/2.6.x/5875:
Locked Puppet license to GPLv2
| -rw-r--r-- | LICENSE | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4,8 +4,8 @@ Puppet Labs can be contacted at: info@puppetlabs.com This program and entire repository 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 any later version. +General Public License Version 2 as published by the Free Software +Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of |