QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/177544
Change subject: Consume monotonic.py under GPLv2+ ...................................................................... Consume monotonic.py under GPLv2+ Ori aggreed that monotonic.py may be consumed under GPLv2+. This makes licensing easier as it evades the Apache License 2.0 vs. GPLv2 issues. Change-Id: Ie548fd77e8f05e659a99247e4de5d0bcc6034a39 --- M server/eventlogging/lib/monotonic.py 1 file changed, 11 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging refs/changes/44/177544/1 diff --git a/server/eventlogging/lib/monotonic.py b/server/eventlogging/lib/monotonic.py index d6dff9f..bf1bdf6 100644 --- a/server/eventlogging/lib/monotonic.py +++ b/server/eventlogging/lib/monotonic.py @@ -25,17 +25,19 @@ Copyright 2014 Ori Livneh <o...@wikimedia.org> - 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 + 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. - http://www.apache.org/licenses/LICENSE-2.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. - 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. + 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. """ from __future__ import absolute_import, division -- To view, visit https://gerrit.wikimedia.org/r/177544 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie548fd77e8f05e659a99247e4de5d0bcc6034a39 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/EventLogging Gerrit-Branch: master Gerrit-Owner: QChris <christ...@quelltextlich.at> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
