← Back to team overview

graphite-dev team mailing list archive

[Merge] lp:~lucio.torre/graphite/add-copyright into lp:graphite

 

Lucio Torre has proposed merging lp:~lucio.torre/graphite/add-copyright into lp:graphite.

Requested reviews:
  graphite-dev (graphite-dev)
Related bugs:
  Bug #919428 in Graphite: "license issue"
  https://bugs.launchpad.net/graphite/+bug/919428

For more details, see:
https://code.launchpad.net/~lucio.torre/graphite/add-copyright/+merge/90636
-- 
https://code.launchpad.net/~lucio.torre/graphite/add-copyright/+merge/90636
Your team graphite-dev is requested to review the proposed merge of lp:~lucio.torre/graphite/add-copyright into lp:graphite.
=== modified file 'carbon/lib/carbon/amqp_listener.py'
--- carbon/lib/carbon/amqp_listener.py	2011-09-18 09:55:35 +0000
+++ carbon/lib/carbon/amqp_listener.py	2012-01-30 03:13:27 +0000
@@ -2,6 +2,18 @@
 """
 Copyright 2009 Lucio Torre <lucio.torre@xxxxxxxxxxxxx>
 
+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.
+
 This is an AMQP client that will connect to the specified broker and read
 messages, parse them, and post them as metrics.
 

=== modified file 'carbon/lib/carbon/amqp_publisher.py'
--- carbon/lib/carbon/amqp_publisher.py	2012-01-27 17:34:50 +0000
+++ carbon/lib/carbon/amqp_publisher.py	2012-01-30 03:13:27 +0000
@@ -2,6 +2,18 @@
 """
 Copyright 2009 Lucio Torre <lucio.torre@xxxxxxxxxxxxx>
 
+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.
+
 Will publish metrics over AMQP
 """
 import os