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

Proposed by Felipe Reyes
Status: Merged
Approved by: Billy Olsen
Approved revision: 81
Merged at revision: 81
Proposed branch: lp:~freyes/charms/trusty/ceilometer/fix-copyright
Merge into: lp:~openstack-charmers-archive/charms/trusty/ceilometer/next
Diff against target: 22 lines (+15/-0)
1 file modified
copyright (+15/-0)
To merge this branch: bzr merge lp:~freyes/charms/trusty/ceilometer/fix-copyright
Reviewer Review Type Date Requested Status
Billy Olsen Approve
Review via email: mp+257078@code.launchpad.net

Description of the change

Dear OpenStack Charmers,

This patch updates the copyright for the third party pacemaker agent ocf/openstack/ceilometer-agent-central

Thanks,

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #3801 ceilometer-next for freyes mp257078
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/3801/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #3588 ceilometer-next for freyes mp257078
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/3588/

Revision history for this message
Billy Olsen (billy-olsen) wrote :

LGTM, Approved - thanks Felipe!

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 2013-01-11 13:07:16 +0000
3+++ copyright 2015-04-22 13:04:13 +0000
4@@ -15,3 +15,18 @@
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+Files: ocf/openstack/ceilometer-agent-central
10+Copyright: Emilien Macchi
11+License: Apache 2.0
12+ Licensed under the Apache License, Version 2.0 (the "License"); you may
13+ not use this file except in compliance with the License. You may obtain
14+ a copy of the License at
15+
16+ http://www.apache.org/licenses/LICENSE-2.0
17+
18+ Unless required by applicable law or agreed to in writing, software
19+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
20+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
21+ License for the specific language governing permissions and limitations
22+ under the License.

Subscribers

People subscribed via source and target branches