Merge lp:~freyes/charms/trusty/hacluster/fix-copyright into lp:~openstack-charmers/charms/trusty/hacluster/next

Proposed by Felipe Reyes
Status: Merged
Merged at revision: 51
Proposed branch: lp:~freyes/charms/trusty/hacluster/fix-copyright
Merge into: lp:~openstack-charmers/charms/trusty/hacluster/next
Diff against target: 36 lines (+19/-2)
1 file modified
copyright (+19/-2)
To merge this branch: bzr merge lp:~freyes/charms/trusty/hacluster/fix-copyright
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+257949@code.launchpad.net

Description of the change

Dear OpenStack Charmers,

This patch adds a copyright section for ocf/ceph/rbd

Best,

To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'copyright'
2--- copyright 2015-04-20 08:59:20 +0000
3+++ copyright 2015-04-30 18:19:12 +0000
4@@ -15,9 +15,9 @@
5 .
6 You should have received a copy of the GNU General Public License
7 along with this program. If not, see <http://www.gnu.org/licenses/>.
8-
9+
10 Files: ocf/ceph/*
11-Copyright: 2012 Florian Haas, hastexo
12+Copyright: 2012 Florian Haas, hastexo
13 License: LGPL-2.1
14 On Debian based systems, see /usr/share/common-licenses/LGPL-2.1.
15
16@@ -36,3 +36,20 @@
17 .
18 You should have received a copy of the GNU General Public License
19 along with this program. If not, see <http://www.gnu.org/licenses/>.
20+
21+Files: ocf/ceph/rbd
22+Copyright: 2012 Florian Haas, hastexo
23+License: LGPL-2.1
24+ This library is free software; you can redistribute it and/or modify it under
25+ the terms of the GNU Lesser General Public License as published by the Free
26+ Software Foundation; either version 2.1 of the License, or (at your option)
27+ any later version.
28+ .
29+ This library is distributed in the hope that it will be useful, but WITHOUT
30+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
31+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
32+ details.
33+ .
34+ You should have received a copy of the GNU Lesser General Public License along
35+ with this library; if not, write to the Free Software Foundation, Inc., 59
36+ Temple Place, Suite 330, Boston, MA 02111-1307 USA

Subscribers

People subscribed via source and target branches