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
=== modified file 'copyright'
--- copyright 2015-04-20 08:59:20 +0000
+++ copyright 2015-04-30 18:19:12 +0000
@@ -15,9 +15,9 @@
15 .15 .
16 You should have received a copy of the GNU General Public License16 You should have received a copy of the GNU General Public License
17 along with this program. If not, see <http://www.gnu.org/licenses/>.17 along with this program. If not, see <http://www.gnu.org/licenses/>.
18 18
19Files: ocf/ceph/*19Files: ocf/ceph/*
20Copyright: 2012 Florian Haas, hastexo 20Copyright: 2012 Florian Haas, hastexo
21License: LGPL-2.121License: LGPL-2.1
22 On Debian based systems, see /usr/share/common-licenses/LGPL-2.1.22 On Debian based systems, see /usr/share/common-licenses/LGPL-2.1.
2323
@@ -36,3 +36,20 @@
36 .36 .
37 You should have received a copy of the GNU General Public License37 You should have received a copy of the GNU General Public License
38 along with this program. If not, see <http://www.gnu.org/licenses/>.38 along with this program. If not, see <http://www.gnu.org/licenses/>.
39
40Files: ocf/ceph/rbd
41Copyright: 2012 Florian Haas, hastexo
42License: LGPL-2.1
43 This library is free software; you can redistribute it and/or modify it under
44 the terms of the GNU Lesser General Public License as published by the Free
45 Software Foundation; either version 2.1 of the License, or (at your option)
46 any later version.
47 .
48 This library is distributed in the hope that it will be useful, but WITHOUT
49 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
50 FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
51 details.
52 .
53 You should have received a copy of the GNU Lesser General Public License along
54 with this library; if not, write to the Free Software Foundation, Inc., 59
55 Temple Place, Suite 330, Boston, MA 02111-1307 USA

Subscribers

People subscribed via source and target branches