Merge ~cjwatson/ols-charm-deps:update-interface-cassandra into ols-charm-deps:master
- Git
- lp:~cjwatson/ols-charm-deps
- update-interface-cassandra
- Merge into master
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | 62d0874b535b7e9f4e3072a8f71a095abea08d94 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | ~cjwatson/ols-charm-deps:update-interface-cassandra |
Merge into: | ols-charm-deps:master |
Diff against target: |
290 lines (+237/-7) 6 files modified
charm-dependencies (+1/-1) interface/cassandra/LICENSE (+202/-0) interface/cassandra/codetree-collect-info.yaml (+6/-5) interface/cassandra/interface.yaml (+1/-1) interface/cassandra/provides.py (+14/-0) interface/cassandra/requires.py (+13/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guillermo Gonzalez | Approve | ||
Review via email:
|
Commit message
Update interface-cassandra to 573c7f5
Description of the change
This adds licensing.
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Otto Co-Pilot (otto-copilot) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/charm-dependencies b/charm-dependencies |
2 | index 678abf2..0615774 100644 |
3 | --- a/charm-dependencies |
4 | +++ b/charm-dependencies |
5 | @@ -20,7 +20,7 @@ interface/rabbitmq git+https://github.com/openstack/charm-interface |
6 | interface/memcache git+https://github.com/canonical/interface-memcache.git;revno=d817304 |
7 | interface/conn-check git+ssh://git.launchpad.net/~ubuntuone-hackers/conn-check/+git/interface-conn-check;revno=780dc16 |
8 | interface/pgsql git+ssh://git.launchpad.net/interface-pgsql;revno=v2.2.1 |
9 | -interface/cassandra git+ssh://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/interface-cassandra;revno=0889b70 |
10 | +interface/cassandra git+ssh://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/interface-cassandra;revno=573c7f5 |
11 | interface/prometheus lp:~ubuntuone-hackers/ols-charm-deps/juju-interface-prometheus;revno=1 |
12 | |
13 | layer @ |
14 | diff --git a/interface/cassandra/LICENSE b/interface/cassandra/LICENSE |
15 | new file mode 100644 |
16 | index 0000000..d645695 |
17 | --- /dev/null |
18 | +++ b/interface/cassandra/LICENSE |
19 | @@ -0,0 +1,202 @@ |
20 | + |
21 | + Apache License |
22 | + Version 2.0, January 2004 |
23 | + http://www.apache.org/licenses/ |
24 | + |
25 | + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION |
26 | + |
27 | + 1. Definitions. |
28 | + |
29 | + "License" shall mean the terms and conditions for use, reproduction, |
30 | + and distribution as defined by Sections 1 through 9 of this document. |
31 | + |
32 | + "Licensor" shall mean the copyright owner or entity authorized by |
33 | + the copyright owner that is granting the License. |
34 | + |
35 | + "Legal Entity" shall mean the union of the acting entity and all |
36 | + other entities that control, are controlled by, or are under common |
37 | + control with that entity. For the purposes of this definition, |
38 | + "control" means (i) the power, direct or indirect, to cause the |
39 | + direction or management of such entity, whether by contract or |
40 | + otherwise, or (ii) ownership of fifty percent (50%) or more of the |
41 | + outstanding shares, or (iii) beneficial ownership of such entity. |
42 | + |
43 | + "You" (or "Your") shall mean an individual or Legal Entity |
44 | + exercising permissions granted by this License. |
45 | + |
46 | + "Source" form shall mean the preferred form for making modifications, |
47 | + including but not limited to software source code, documentation |
48 | + source, and configuration files. |
49 | + |
50 | + "Object" form shall mean any form resulting from mechanical |
51 | + transformation or translation of a Source form, including but |
52 | + not limited to compiled object code, generated documentation, |
53 | + and conversions to other media types. |
54 | + |
55 | + "Work" shall mean the work of authorship, whether in Source or |
56 | + Object form, made available under the License, as indicated by a |
57 | + copyright notice that is included in or attached to the work |
58 | + (an example is provided in the Appendix below). |
59 | + |
60 | + "Derivative Works" shall mean any work, whether in Source or Object |
61 | + form, that is based on (or derived from) the Work and for which the |
62 | + editorial revisions, annotations, elaborations, or other modifications |
63 | + represent, as a whole, an original work of authorship. For the purposes |
64 | + of this License, Derivative Works shall not include works that remain |
65 | + separable from, or merely link (or bind by name) to the interfaces of, |
66 | + the Work and Derivative Works thereof. |
67 | + |
68 | + "Contribution" shall mean any work of authorship, including |
69 | + the original version of the Work and any modifications or additions |
70 | + to that Work or Derivative Works thereof, that is intentionally |
71 | + submitted to Licensor for inclusion in the Work by the copyright owner |
72 | + or by an individual or Legal Entity authorized to submit on behalf of |
73 | + the copyright owner. For the purposes of this definition, "submitted" |
74 | + means any form of electronic, verbal, or written communication sent |
75 | + to the Licensor or its representatives, including but not limited to |
76 | + communication on electronic mailing lists, source code control systems, |
77 | + and issue tracking systems that are managed by, or on behalf of, the |
78 | + Licensor for the purpose of discussing and improving the Work, but |
79 | + excluding communication that is conspicuously marked or otherwise |
80 | + designated in writing by the copyright owner as "Not a Contribution." |
81 | + |
82 | + "Contributor" shall mean Licensor and any individual or Legal Entity |
83 | + on behalf of whom a Contribution has been received by Licensor and |
84 | + subsequently incorporated within the Work. |
85 | + |
86 | + 2. Grant of Copyright License. Subject to the terms and conditions of |
87 | + this License, each Contributor hereby grants to You a perpetual, |
88 | + worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
89 | + copyright license to reproduce, prepare Derivative Works of, |
90 | + publicly display, publicly perform, sublicense, and distribute the |
91 | + Work and such Derivative Works in Source or Object form. |
92 | + |
93 | + 3. Grant of Patent License. Subject to the terms and conditions of |
94 | + this License, each Contributor hereby grants to You a perpetual, |
95 | + worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
96 | + (except as stated in this section) patent license to make, have made, |
97 | + use, offer to sell, sell, import, and otherwise transfer the Work, |
98 | + where such license applies only to those patent claims licensable |
99 | + by such Contributor that are necessarily infringed by their |
100 | + Contribution(s) alone or by combination of their Contribution(s) |
101 | + with the Work to which such Contribution(s) was submitted. If You |
102 | + institute patent litigation against any entity (including a |
103 | + cross-claim or counterclaim in a lawsuit) alleging that the Work |
104 | + or a Contribution incorporated within the Work constitutes direct |
105 | + or contributory patent infringement, then any patent licenses |
106 | + granted to You under this License for that Work shall terminate |
107 | + as of the date such litigation is filed. |
108 | + |
109 | + 4. Redistribution. You may reproduce and distribute copies of the |
110 | + Work or Derivative Works thereof in any medium, with or without |
111 | + modifications, and in Source or Object form, provided that You |
112 | + meet the following conditions: |
113 | + |
114 | + (a) You must give any other recipients of the Work or |
115 | + Derivative Works a copy of this License; and |
116 | + |
117 | + (b) You must cause any modified files to carry prominent notices |
118 | + stating that You changed the files; and |
119 | + |
120 | + (c) You must retain, in the Source form of any Derivative Works |
121 | + that You distribute, all copyright, patent, trademark, and |
122 | + attribution notices from the Source form of the Work, |
123 | + excluding those notices that do not pertain to any part of |
124 | + the Derivative Works; and |
125 | + |
126 | + (d) If the Work includes a "NOTICE" text file as part of its |
127 | + distribution, then any Derivative Works that You distribute must |
128 | + include a readable copy of the attribution notices contained |
129 | + within such NOTICE file, excluding those notices that do not |
130 | + pertain to any part of the Derivative Works, in at least one |
131 | + of the following places: within a NOTICE text file distributed |
132 | + as part of the Derivative Works; within the Source form or |
133 | + documentation, if provided along with the Derivative Works; or, |
134 | + within a display generated by the Derivative Works, if and |
135 | + wherever such third-party notices normally appear. The contents |
136 | + of the NOTICE file are for informational purposes only and |
137 | + do not modify the License. You may add Your own attribution |
138 | + notices within Derivative Works that You distribute, alongside |
139 | + or as an addendum to the NOTICE text from the Work, provided |
140 | + that such additional attribution notices cannot be construed |
141 | + as modifying the License. |
142 | + |
143 | + You may add Your own copyright statement to Your modifications and |
144 | + may provide additional or different license terms and conditions |
145 | + for use, reproduction, or distribution of Your modifications, or |
146 | + for any such Derivative Works as a whole, provided Your use, |
147 | + reproduction, and distribution of the Work otherwise complies with |
148 | + the conditions stated in this License. |
149 | + |
150 | + 5. Submission of Contributions. Unless You explicitly state otherwise, |
151 | + any Contribution intentionally submitted for inclusion in the Work |
152 | + by You to the Licensor shall be under the terms and conditions of |
153 | + this License, without any additional terms or conditions. |
154 | + Notwithstanding the above, nothing herein shall supersede or modify |
155 | + the terms of any separate license agreement you may have executed |
156 | + with Licensor regarding such Contributions. |
157 | + |
158 | + 6. Trademarks. This License does not grant permission to use the trade |
159 | + names, trademarks, service marks, or product names of the Licensor, |
160 | + except as required for reasonable and customary use in describing the |
161 | + origin of the Work and reproducing the content of the NOTICE file. |
162 | + |
163 | + 7. Disclaimer of Warranty. Unless required by applicable law or |
164 | + agreed to in writing, Licensor provides the Work (and each |
165 | + Contributor provides its Contributions) on an "AS IS" BASIS, |
166 | + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
167 | + implied, including, without limitation, any warranties or conditions |
168 | + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A |
169 | + PARTICULAR PURPOSE. You are solely responsible for determining the |
170 | + appropriateness of using or redistributing the Work and assume any |
171 | + risks associated with Your exercise of permissions under this License. |
172 | + |
173 | + 8. Limitation of Liability. In no event and under no legal theory, |
174 | + whether in tort (including negligence), contract, or otherwise, |
175 | + unless required by applicable law (such as deliberate and grossly |
176 | + negligent acts) or agreed to in writing, shall any Contributor be |
177 | + liable to You for damages, including any direct, indirect, special, |
178 | + incidental, or consequential damages of any character arising as a |
179 | + result of this License or out of the use or inability to use the |
180 | + Work (including but not limited to damages for loss of goodwill, |
181 | + work stoppage, computer failure or malfunction, or any and all |
182 | + other commercial damages or losses), even if such Contributor |
183 | + has been advised of the possibility of such damages. |
184 | + |
185 | + 9. Accepting Warranty or Additional Liability. While redistributing |
186 | + the Work or Derivative Works thereof, You may choose to offer, |
187 | + and charge a fee for, acceptance of support, warranty, indemnity, |
188 | + or other liability obligations and/or rights consistent with this |
189 | + License. However, in accepting such obligations, You may act only |
190 | + on Your own behalf and on Your sole responsibility, not on behalf |
191 | + of any other Contributor, and only if You agree to indemnify, |
192 | + defend, and hold each Contributor harmless for any liability |
193 | + incurred by, or claims asserted against, such Contributor by reason |
194 | + of your accepting any such warranty or additional liability. |
195 | + |
196 | + END OF TERMS AND CONDITIONS |
197 | + |
198 | + APPENDIX: How to apply the Apache License to your work. |
199 | + |
200 | + To apply the Apache License to your work, attach the following |
201 | + boilerplate notice, with the fields enclosed by brackets "[]" |
202 | + replaced with your own identifying information. (Don't include |
203 | + the brackets!) The text should be enclosed in the appropriate |
204 | + comment syntax for the file format. We also recommend that a |
205 | + file or class name and description of purpose be included on the |
206 | + same "printed page" as the copyright notice for easier |
207 | + identification within third-party archives. |
208 | + |
209 | + Copyright [yyyy] [name of copyright owner] |
210 | + |
211 | + Licensed under the Apache License, Version 2.0 (the "License"); |
212 | + you may not use this file except in compliance with the License. |
213 | + You may obtain a copy of the License at |
214 | + |
215 | + http://www.apache.org/licenses/LICENSE-2.0 |
216 | + |
217 | + Unless required by applicable law or agreed to in writing, software |
218 | + distributed under the License is distributed on an "AS IS" BASIS, |
219 | + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
220 | + See the License for the specific language governing permissions and |
221 | + limitations under the License. |
222 | diff --git a/interface/cassandra/codetree-collect-info.yaml b/interface/cassandra/codetree-collect-info.yaml |
223 | index 722c42e..3f547e0 100644 |
224 | --- a/interface/cassandra/codetree-collect-info.yaml |
225 | +++ b/interface/cassandra/codetree-collect-info.yaml |
226 | @@ -1,6 +1,7 @@ |
227 | -collect_date: '2022-11-24 05:42:48.127766' |
228 | -collect_url: git+ssh://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/interface-cassandra;revno=0889b70171613f3c22f62a24e4ded3f263a67128 |
229 | +collect_date: '2023-03-02 12:57:20.662132' |
230 | +collect_url: git+ssh://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/interface-cassandra;revno=573c7f5c57de10d8c23dd46448b39a1e0fa02308 |
231 | hashes: |
232 | - interface.yaml: d9452c522d2f235c120dcec08d3c2d675bee6e4d7f6bda15ae04c886a089d8c4 |
233 | - provides.py: cc7e4b8356ab29be12b42f3f9e708ac1d7c9ba70dd5fcd1c8aeaccd6b6c6502b |
234 | - requires.py: fa7921c2ce794c76d0276b5010ae5b3c7d0b164f27458b4cac20ed4021a51c7a |
235 | + LICENSE: cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 |
236 | + interface.yaml: 8684c671c96b5f2524d6751855d85acff55b2f066042dcf2560ab4a5c066e986 |
237 | + provides.py: a7a15c7bff7f31c38370f083c98279f159ecae949fe2990083f4462c19e031ee |
238 | + requires.py: b7b40faa3f4ca8d5910aa1d86360f114c2be79e4763058b5bfc4dd82f853752d |
239 | diff --git a/interface/cassandra/interface.yaml b/interface/cassandra/interface.yaml |
240 | index 25ae102..dde57ac 100644 |
241 | --- a/interface/cassandra/interface.yaml |
242 | +++ b/interface/cassandra/interface.yaml |
243 | @@ -1,3 +1,3 @@ |
244 | name: cassandra |
245 | summary: Snap Statistics Service. |
246 | -maintainer: Onlines Services <online-services@canonical.com> |
247 | +maintainer: Online Services <online-services@canonical.com> |
248 | diff --git a/interface/cassandra/provides.py b/interface/cassandra/provides.py |
249 | index 9b09797..418c05f 100644 |
250 | --- a/interface/cassandra/provides.py |
251 | +++ b/interface/cassandra/provides.py |
252 | @@ -1,3 +1,17 @@ |
253 | +# Copyright (C) 2017 Canonical Ltd. |
254 | +# |
255 | +# Licensed under the Apache License, Version 2.0 (the "License"); |
256 | +# you may not use this file except in compliance with the License. |
257 | +# You may obtain a copy of the License at |
258 | +# |
259 | +# https://www.apache.org/licenses/LICENSE-2.0 |
260 | +# |
261 | +# Unless required by applicable law or agreed to in writing, software |
262 | +# distributed under the License is distributed on an "AS IS" BASIS, |
263 | +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
264 | +# See the License for the specific language governing permissions and |
265 | +# limitations under the License. |
266 | + |
267 | from charmhelpers.core import hookenv |
268 | from charms.reactive import hook, scopes, RelationBase |
269 | |
270 | diff --git a/interface/cassandra/requires.py b/interface/cassandra/requires.py |
271 | index 873265a..4c456d8 100644 |
272 | --- a/interface/cassandra/requires.py |
273 | +++ b/interface/cassandra/requires.py |
274 | @@ -1,3 +1,16 @@ |
275 | +# Copyright (C) 2017 Canonical Ltd. |
276 | +# |
277 | +# Licensed under the Apache License, Version 2.0 (the "License"); |
278 | +# you may not use this file except in compliance with the License. |
279 | +# You may obtain a copy of the License at |
280 | +# |
281 | +# https://www.apache.org/licenses/LICENSE-2.0 |
282 | +# |
283 | +# Unless required by applicable law or agreed to in writing, software |
284 | +# distributed under the License is distributed on an "AS IS" BASIS, |
285 | +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
286 | +# See the License for the specific language governing permissions and |
287 | +# limitations under the License. |
288 | |
289 | from charmhelpers.core import hookenv |
290 | from charms.reactive import hook |
+1