Merge lp:~jose/charms/precise/jenkins-slave/1297601-fix into lp:charms/jenkins-slave
- Precise Pangolin (12.04)
- 1297601-fix
- Merge into trunk
Proposed by
José Antonio Rey
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 11 | ||||
Proposed branch: | lp:~jose/charms/precise/jenkins-slave/1297601-fix | ||||
Merge into: | lp:charms/jenkins-slave | ||||
Diff against target: |
627 lines (+599/-1) 3 files modified
config.yaml (+1/-0) icon.svg (+596/-0) metadata.yaml (+2/-1) |
||||
To merge this branch: | bzr merge lp:~jose/charms/precise/jenkins-slave/1297601-fix | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Ceppi (community) | Approve | ||
Charles Butler (community) | Needs Fixing | ||
Review via email: mp+212760@code.launchpad.net |
Commit message
Added icon, blank default on config.yaml and fixed metadata.yaml
Description of the change
Charmworld reports the following errors:
err: Unknown root metadata field (ensemble)
warn: Metadata is missing categories.
warn: No icon.svg file.
warn: no README file
warn: config.yaml: option labels does not have the keys: default
Fixed all of them.
To post a comment you must log in.
- 12. By José Antonio Rey
-
Updated icon to match master, removed README
Revision history for this message
José Antonio Rey (jose) wrote : | # |
I have updated the icon as requested, and removed the README as I don't know much about the service, and can't give precise information.
Revision history for this message
Marco Ceppi (marcoceppi) wrote : | # |
I'm filling a new bug to address the README since it's not being fixed here
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'config.yaml' | |||
2 | --- config.yaml 2011-09-22 08:51:30 +0000 | |||
3 | +++ config.yaml 2014-04-05 18:46:28 +0000 | |||
4 | @@ -6,3 +6,4 @@ | |||
5 | 6 | labels: | 6 | labels: |
6 | 7 | type: string | 7 | type: string |
7 | 8 | description: Jenkins labels to associate with jenkins slave node | 8 | description: Jenkins labels to associate with jenkins slave node |
8 | 9 | default: "" | ||
9 | 9 | 10 | ||
10 | === added file 'icon.svg' | |||
11 | --- icon.svg 1970-01-01 00:00:00 +0000 | |||
12 | +++ icon.svg 2014-04-05 18:46:28 +0000 | |||
13 | @@ -0,0 +1,596 @@ | |||
14 | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
15 | 2 | <!-- Created with Inkscape (http://www.inkscape.org/) --> | ||
16 | 3 | |||
17 | 4 | <svg | ||
18 | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
19 | 6 | xmlns:cc="http://creativecommons.org/ns#" | ||
20 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
21 | 8 | xmlns:svg="http://www.w3.org/2000/svg" | ||
22 | 9 | xmlns="http://www.w3.org/2000/svg" | ||
23 | 10 | xmlns:xlink="http://www.w3.org/1999/xlink" | ||
24 | 11 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | ||
25 | 12 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
26 | 13 | width="96" | ||
27 | 14 | height="96" | ||
28 | 15 | id="svg6517" | ||
29 | 16 | version="1.1" | ||
30 | 17 | inkscape:version="0.48.4 r9939" | ||
31 | 18 | sodipodi:docname="icon.svg"> | ||
32 | 19 | <defs | ||
33 | 20 | id="defs6519"> | ||
34 | 21 | <linearGradient | ||
35 | 22 | inkscape:collect="always" | ||
36 | 23 | xlink:href="#Background" | ||
37 | 24 | id="linearGradient6461" | ||
38 | 25 | gradientUnits="userSpaceOnUse" | ||
39 | 26 | x1="0" | ||
40 | 27 | y1="970.29498" | ||
41 | 28 | x2="144" | ||
42 | 29 | y2="970.29498" | ||
43 | 30 | gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" /> | ||
44 | 31 | <linearGradient | ||
45 | 32 | id="Background"> | ||
46 | 33 | <stop | ||
47 | 34 | id="stop4178" | ||
48 | 35 | offset="0" | ||
49 | 36 | style="stop-color:#49728b;stop-opacity:1" /> | ||
50 | 37 | <stop | ||
51 | 38 | id="stop4180" | ||
52 | 39 | offset="1" | ||
53 | 40 | style="stop-color:#8eabb7;stop-opacity:1" /> | ||
54 | 41 | </linearGradient> | ||
55 | 42 | <filter | ||
56 | 43 | style="color-interpolation-filters:sRGB;" | ||
57 | 44 | inkscape:label="Inner Shadow" | ||
58 | 45 | id="filter1121"> | ||
59 | 46 | <feFlood | ||
60 | 47 | flood-opacity="0.59999999999999998" | ||
61 | 48 | flood-color="rgb(0,0,0)" | ||
62 | 49 | result="flood" | ||
63 | 50 | id="feFlood1123" /> | ||
64 | 51 | <feComposite | ||
65 | 52 | in="flood" | ||
66 | 53 | in2="SourceGraphic" | ||
67 | 54 | operator="out" | ||
68 | 55 | result="composite1" | ||
69 | 56 | id="feComposite1125" /> | ||
70 | 57 | <feGaussianBlur | ||
71 | 58 | in="composite1" | ||
72 | 59 | stdDeviation="1" | ||
73 | 60 | result="blur" | ||
74 | 61 | id="feGaussianBlur1127" /> | ||
75 | 62 | <feOffset | ||
76 | 63 | dx="0" | ||
77 | 64 | dy="2" | ||
78 | 65 | result="offset" | ||
79 | 66 | id="feOffset1129" /> | ||
80 | 67 | <feComposite | ||
81 | 68 | in="offset" | ||
82 | 69 | in2="SourceGraphic" | ||
83 | 70 | operator="atop" | ||
84 | 71 | result="composite2" | ||
85 | 72 | id="feComposite1131" /> | ||
86 | 73 | </filter> | ||
87 | 74 | <filter | ||
88 | 75 | style="color-interpolation-filters:sRGB;" | ||
89 | 76 | inkscape:label="Drop Shadow" | ||
90 | 77 | id="filter950"> | ||
91 | 78 | <feFlood | ||
92 | 79 | flood-opacity="0.25" | ||
93 | 80 | flood-color="rgb(0,0,0)" | ||
94 | 81 | result="flood" | ||
95 | 82 | id="feFlood952" /> | ||
96 | 83 | <feComposite | ||
97 | 84 | in="flood" | ||
98 | 85 | in2="SourceGraphic" | ||
99 | 86 | operator="in" | ||
100 | 87 | result="composite1" | ||
101 | 88 | id="feComposite954" /> | ||
102 | 89 | <feGaussianBlur | ||
103 | 90 | in="composite1" | ||
104 | 91 | stdDeviation="1" | ||
105 | 92 | result="blur" | ||
106 | 93 | id="feGaussianBlur956" /> | ||
107 | 94 | <feOffset | ||
108 | 95 | dx="0" | ||
109 | 96 | dy="1" | ||
110 | 97 | result="offset" | ||
111 | 98 | id="feOffset958" /> | ||
112 | 99 | <feComposite | ||
113 | 100 | in="SourceGraphic" | ||
114 | 101 | in2="offset" | ||
115 | 102 | operator="over" | ||
116 | 103 | result="composite2" | ||
117 | 104 | id="feComposite960" /> | ||
118 | 105 | </filter> | ||
119 | 106 | <clipPath | ||
120 | 107 | clipPathUnits="userSpaceOnUse" | ||
121 | 108 | id="clipPath873"> | ||
122 | 109 | <g | ||
123 | 110 | transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)" | ||
124 | 111 | id="g875" | ||
125 | 112 | inkscape:label="Layer 1" | ||
126 | 113 | style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"> | ||
127 | 114 | <path | ||
128 | 115 | style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline" | ||
129 | 116 | d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z" | ||
130 | 117 | id="path877" | ||
131 | 118 | inkscape:connector-curvature="0" | ||
132 | 119 | sodipodi:nodetypes="sssssssss" /> | ||
133 | 120 | </g> | ||
134 | 121 | </clipPath> | ||
135 | 122 | <filter | ||
136 | 123 | inkscape:collect="always" | ||
137 | 124 | id="filter891" | ||
138 | 125 | inkscape:label="Badge Shadow"> | ||
139 | 126 | <feGaussianBlur | ||
140 | 127 | inkscape:collect="always" | ||
141 | 128 | stdDeviation="0.71999962" | ||
142 | 129 | id="feGaussianBlur893" /> | ||
143 | 130 | </filter> | ||
144 | 131 | <clipPath | ||
145 | 132 | id="clipPath18" | ||
146 | 133 | clipPathUnits="userSpaceOnUse"> | ||
147 | 134 | <path | ||
148 | 135 | inkscape:connector-curvature="0" | ||
149 | 136 | id="path20" | ||
150 | 137 | d="M 0,2494.84 0,0 l 1804.34,0 0,2494.84 -1804.34,0 z" /> | ||
151 | 138 | </clipPath> | ||
152 | 139 | </defs> | ||
153 | 140 | <sodipodi:namedview | ||
154 | 141 | id="base" | ||
155 | 142 | pagecolor="#ffffff" | ||
156 | 143 | bordercolor="#666666" | ||
157 | 144 | borderopacity="1.0" | ||
158 | 145 | inkscape:pageopacity="0.0" | ||
159 | 146 | inkscape:pageshadow="2" | ||
160 | 147 | inkscape:zoom="4.13" | ||
161 | 148 | inkscape:cx="88.834295" | ||
162 | 149 | inkscape:cy="49.0292" | ||
163 | 150 | inkscape:document-units="px" | ||
164 | 151 | inkscape:current-layer="layer1" | ||
165 | 152 | showgrid="false" | ||
166 | 153 | fit-margin-top="0" | ||
167 | 154 | fit-margin-left="0" | ||
168 | 155 | fit-margin-right="0" | ||
169 | 156 | fit-margin-bottom="0" | ||
170 | 157 | inkscape:window-width="1920" | ||
171 | 158 | inkscape:window-height="1056" | ||
172 | 159 | inkscape:window-x="0" | ||
173 | 160 | inkscape:window-y="24" | ||
174 | 161 | inkscape:window-maximized="1" | ||
175 | 162 | showborder="true" | ||
176 | 163 | showguides="true" | ||
177 | 164 | inkscape:guide-bbox="true" | ||
178 | 165 | inkscape:showpageshadow="false"> | ||
179 | 166 | <inkscape:grid | ||
180 | 167 | type="xygrid" | ||
181 | 168 | id="grid821" /> | ||
182 | 169 | <sodipodi:guide | ||
183 | 170 | orientation="1,0" | ||
184 | 171 | position="16,48" | ||
185 | 172 | id="guide823" /> | ||
186 | 173 | <sodipodi:guide | ||
187 | 174 | orientation="0,1" | ||
188 | 175 | position="64,80" | ||
189 | 176 | id="guide825" /> | ||
190 | 177 | <sodipodi:guide | ||
191 | 178 | orientation="1,0" | ||
192 | 179 | position="80,40" | ||
193 | 180 | id="guide827" /> | ||
194 | 181 | <sodipodi:guide | ||
195 | 182 | orientation="0,1" | ||
196 | 183 | position="64,16" | ||
197 | 184 | id="guide829" /> | ||
198 | 185 | </sodipodi:namedview> | ||
199 | 186 | <metadata | ||
200 | 187 | id="metadata6522"> | ||
201 | 188 | <rdf:RDF> | ||
202 | 189 | <cc:Work | ||
203 | 190 | rdf:about=""> | ||
204 | 191 | <dc:format>image/svg+xml</dc:format> | ||
205 | 192 | <dc:type | ||
206 | 193 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
207 | 194 | <dc:title /> | ||
208 | 195 | </cc:Work> | ||
209 | 196 | </rdf:RDF> | ||
210 | 197 | </metadata> | ||
211 | 198 | <g | ||
212 | 199 | inkscape:label="BACKGROUND" | ||
213 | 200 | inkscape:groupmode="layer" | ||
214 | 201 | id="layer1" | ||
215 | 202 | transform="translate(268,-635.29076)" | ||
216 | 203 | style="display:inline"> | ||
217 | 204 | <path | ||
218 | 205 | style="fill:url(#linearGradient6461);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)" | ||
219 | 206 | d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z" | ||
220 | 207 | id="path6455" | ||
221 | 208 | inkscape:connector-curvature="0" | ||
222 | 209 | sodipodi:nodetypes="sssssssss" /> | ||
223 | 210 | <g | ||
224 | 211 | transform="matrix(0.19496217,0,0,-0.19496217,-239.28382,701.0732)" | ||
225 | 212 | inkscape:label="ink_ext_XXXXXX" | ||
226 | 213 | id="g10"> | ||
227 | 214 | <g | ||
228 | 215 | id="g3393"> | ||
229 | 216 | <path | ||
230 | 217 | inkscape:connector-curvature="0" | ||
231 | 218 | id="path22" | ||
232 | 219 | style="fill:#d33833;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
233 | 220 | d="m 177.718,129.264 c 0,-49.4288 -39.175,-89.4992 -87.5,-89.4992 -48.3242,0 -87.49925,40.0704 -87.49925,89.4992 0,49.43 39.17505,89.501 87.49925,89.501 48.325,0 87.5,-40.071 87.5,-89.501" /> | ||
234 | 221 | <path | ||
235 | 222 | inkscape:connector-curvature="0" | ||
236 | 223 | id="path24" | ||
237 | 224 | style="fill:#ef3d3a;fill-opacity:1;fill-rule:nonzero;stroke:none" | ||
238 | 225 | d="m 6.28438,107.098 c 0,0 -6.33438,93.333 79.66602,96 l -5.9996,10 -46.6664,-15.667 -13.3336,-15.333 -11.66642,-22.334 -6.66719,-26 2,-17.333" /> | ||
239 | 226 | <path | ||
240 | 227 | inkscape:connector-curvature="0" | ||
241 | 228 | id="path26" | ||
242 | 229 | style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" | ||
243 | 230 | d="M 30.2883,190.319 C 14.9363,174.611 5.43633,152.923 5.43633,128.93 l 0,0 c 0,-23.988 9.49997,-45.6788 24.85197,-61.3839 l 0,0 C 45.6477,51.841 66.8152,42.15 90.2168,42.15 l 0,0 c 23.4022,0 44.5712,9.691 59.9292,25.3961 l 0,0 c 15.351,15.7051 24.853,37.3959 24.853,61.3839 l 0,0 c 0,23.993 -9.502,45.681 -24.853,61.389 l 0,0 c -15.358,15.702 -36.527,25.393 -59.9292,25.395 l 0,0 C 66.8152,215.712 45.6477,206.021 30.2883,190.319 l 0,0 z M 26.4023,63.7469 C 10.0867,80.4328 0,103.493 0,128.93 l 0,0 c 0,25.441 10.0867,48.499 26.4023,65.186 l 0,0 c 16.3118,16.69 38.8915,27.035 63.8145,27.032 l 0,0 c 24.9232,0.003 47.5052,-10.342 63.8142,-27.032 l 0,0 c 16.317,-16.687 26.405,-39.747 26.403,-65.186 l 0,0 c 0.002,-25.437 -10.086,-48.4972 -26.403,-65.1831 l 0,0 C 137.722,47.0578 115.14,36.7141 90.2168,36.7141 l 0,0 c -24.923,0 -47.5027,10.3437 -63.8145,27.0328 l 0,0" /> | ||
244 | 231 | <path | ||
245 | 232 | inkscape:connector-curvature="0" | ||
246 | 233 | id="path28" | ||
247 | 234 | style="fill:#f0d6b7;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
248 | 235 | d="m 127.051,128.768 -13.334,-2 -18.0002,-2 -11.6672,-0.333 -11.3328,0.333 -8.6672,2.667 -7.6668,8.333 -6,17 -1.3332,3.667 -8,2.666 -4.6668,7.667 -3.3332,11 3.6672,9.667 8.666,3 7,-3.334 3.334,-7.333 4,0.667 1.3328,1.666 -1.3328,7.667 -0.334,9.667 2,13.333 -0.0781,7.616 6.0781,9.717 10.6668,7.667 18.6672,8 20.6662,-3 18,-13 8.334,-13.333 5.333,-9.667 1.333,-24 -4,-20.667 -7.333,-18.333 -7,-9.667" /> | ||
249 | 236 | <path | ||
250 | 237 | inkscape:connector-curvature="0" | ||
251 | 238 | id="path30" | ||
252 | 239 | style="fill:#335061;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
253 | 240 | d="m 115.717,71.102 -47.6674,-2 0,-8 4,-28 -2,-2.334 -33.3328,11.334 -2.334,4 -3.3332,37.666 -7.6656,22.667 -1.6672,5.333 26.666,18.333 8.334,3.334 7.3328,-9 6.3332,-5.667 7.334,-2.333 3.3328,-1 4,-17.333 3,-3.6668 7.6672,2.6668 -5.334,-10.334 29.0002,-13.666 -3.666,-2" /> | ||
254 | 241 | <path | ||
255 | 242 | inkscape:connector-curvature="0" | ||
256 | 243 | id="path32" | ||
257 | 244 | style="fill:#6d6b6d;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
258 | 245 | d="m 36.7168,187.435 8.666,3 7,-3.334 3.334,-7.333 4,0.667 1,4 -2,7.666 2,18.334 -1.6672,10 6,7 13,10.333 -3.6668,5 -18.3332,-9 -7.6668,-6 -4.3332,-9.333 -6.6668,-9 -2,-10.667 1.334,-11.333" /> | ||
259 | 246 | <path | ||
260 | 247 | inkscape:connector-curvature="0" | ||
261 | 248 | id="path34" | ||
262 | 249 | style="fill:#dcd9d8;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
263 | 250 | d="m 50.3828,218.768 c 0,0 5,12.333 25,18.333 20,6 1,4.334 1,4.334 l -21.666,-8.334 -8.334,-8.333 -3.666,-6.667 7.666,0.667" /> | ||
264 | 251 | <path | ||
265 | 252 | inkscape:connector-curvature="0" | ||
266 | 253 | id="path36" | ||
267 | 254 | style="fill:#dcd9d8;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
268 | 255 | d="m 40.3828,189.768 c 0,0 -7,23.334 19.6668,26.667 l -1,4 -18.3328,-4.334 -5.334,-17.333 1.334,-11.333 3.666,2.333" /> | ||
269 | 256 | <path | ||
270 | 257 | inkscape:connector-curvature="0" | ||
271 | 258 | id="path38" | ||
272 | 259 | style="fill:#f7e4cd;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
273 | 260 | d="m 51.0496,158.768 4.3645,4.229 c 0,0 1.9699,-0.229 2.3027,-2.562 0.3328,-2.334 1.3328,-23.334 15.666,-34.668 1.3074,-1.034 -10.666,1.668 -10.666,1.668 l -10.6672,16.666" /> | ||
274 | 261 | <path | ||
275 | 262 | inkscape:connector-curvature="0" | ||
276 | 263 | id="path40" | ||
277 | 264 | style="fill:#f7e4cd;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
278 | 265 | d="m 112.385,165.101 c 0,0 0.777,10.104 3.498,9.327 2.721,-0.777 2.721,-3.498 2.721,-3.498 0,0 -6.608,-4.275 -6.219,-5.829" /> | ||
279 | 266 | <path | ||
280 | 267 | inkscape:connector-curvature="0" | ||
281 | 268 | id="path42" | ||
282 | 269 | style="fill:#f7e4cd;fill-opacity:1;fill-rule:nonzero;stroke:none" | ||
283 | 270 | d="m 140.05,202.101 c 0,0 -5.494,-1.16 -6,-6 -0.506,-4.841 6,-1 7,-0.667" /> | ||
284 | 271 | <path | ||
285 | 272 | inkscape:connector-curvature="0" | ||
286 | 273 | id="path44" | ||
287 | 274 | style="fill:#f7e4cd;fill-opacity:1;fill-rule:nonzero;stroke:none" | ||
288 | 275 | d="m 99.7168,201.767 c 0,0 -7.334,-1 -7.334,-5.666 0,-4.667 8.3342,-4.334 10.6672,-2.334" /> | ||
289 | 276 | <path | ||
290 | 277 | inkscape:connector-curvature="0" | ||
291 | 278 | id="path46" | ||
292 | 279 | style="fill:#f7e4cd;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
293 | 280 | d="m 54.3828,180.101 c 0,0 -12.6672,7.667 -14,0.333 -1.3332,-7.333 -4.334,-12.667 2,-20.333 l -4.3332,1.333 -4,10.333 -1.3328,10 7.666,8.001 8.6668,-0.667 5,-4 0.3332,-5" /> | ||
294 | 281 | <path | ||
295 | 282 | inkscape:connector-curvature="0" | ||
296 | 283 | id="path48" | ||
297 | 284 | style="fill:#f7e4cd;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
298 | 285 | d="m 60.3828,201.101 c 0,0 5.6668,29.333 34.334,35 23.6012,4.665 35.9992,-1 40.6662,-6.333 0,0 -21,24.999 -41.0002,17.333 -20,-7.667 -34.666,-21.667 -34.3332,-30.666 0.5676,-15.328 0.3332,-15.334 0.3332,-15.334" /> | ||
299 | 286 | <path | ||
300 | 287 | inkscape:connector-curvature="0" | ||
301 | 288 | id="path50" | ||
302 | 289 | style="fill:#f7e4cd;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
303 | 290 | d="m 137.717,226.435 c 0,0 -9.666,0.333 -10,-8.334 0,0 -0.001,-1.333 0.666,-2.666 0,0 7.668,8.667 12.334,4" /> | ||
304 | 291 | <path | ||
305 | 292 | inkscape:connector-curvature="0" | ||
306 | 293 | id="path52" | ||
307 | 294 | style="fill:#f7e4cd;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
308 | 295 | d="m 95.3887,214.532 c 0,0 -1.6641,13.303 -13.0059,5.569 -7.3332,-5 -6.666,-12 -5.3332,-13.333 1.3332,-1.334 0.9707,-4.019 1.9856,-2.176 1.0144,1.843 0.6804,7.843 4.3476,9.509 3.6668,1.667 9.6777,3.529 12.0059,0.431" /> | ||
309 | 296 | <path | ||
310 | 297 | inkscape:connector-curvature="0" | ||
311 | 298 | id="path54" | ||
312 | 299 | style="fill:#49728b;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
313 | 300 | d="m 64.0496,124.435 -31.3328,-14 c 0,0 13,-51.667 6.3328,-67.667 l -4.6668,1.666 -0.3332,19.6672 -8.6656,37.3328 -3.6672,10.334 32.666,21.999 9.6668,-9.332" /> | ||
314 | 301 | <path | ||
315 | 302 | inkscape:connector-curvature="0" | ||
316 | 303 | id="path56" | ||
317 | 304 | style="fill:#49728b;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
318 | 305 | d="m 67.2715,95.8578 4.4453,-5.4238 0,-20 -5.334,0 c 0,0 -0.666,14 -0.666,15.6672 0,1.6668 0.666,7.6668 0.666,7.6668" /> | ||
319 | 306 | <path | ||
320 | 307 | inkscape:connector-curvature="0" | ||
321 | 308 | id="path58" | ||
322 | 309 | style="fill:#49728b;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
323 | 310 | d="m 67.3828,67.434 -15,-0.666 4.334,-3 10.666,-1.6668" /> | ||
324 | 311 | <path | ||
325 | 312 | inkscape:connector-curvature="0" | ||
326 | 313 | id="path60" | ||
327 | 314 | style="fill:#335061;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
328 | 315 | d="m 118.717,70.768 12.333,0.3332 3,-30.6672 -12.667,-1.666 -2.666,32" /> | ||
329 | 316 | <path | ||
330 | 317 | inkscape:connector-curvature="0" | ||
331 | 318 | id="path62" | ||
332 | 319 | style="fill:#335061;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
333 | 320 | d="m 122.05,70.768 18.667,1 c 0,0 7.666,19.3332 7.666,20.3332 0,1 6.667,27.9998 6.667,27.9998 l -15,15.666 -3,2.667 -8,-8 0,-31 -7,-28.666" /> | ||
334 | 321 | <path | ||
335 | 322 | inkscape:connector-curvature="0" | ||
336 | 323 | id="path64" | ||
337 | 324 | style="fill:#49728b;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
338 | 325 | d="m 130.383,73.1012 -11.666,-2.3332 1.666,-9.334 c 4.333,-2 11.667,3.334 11.667,3.334" /> | ||
339 | 326 | <path | ||
340 | 327 | inkscape:connector-curvature="0" | ||
341 | 328 | id="path66" | ||
342 | 329 | style="fill:#49728b;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
343 | 330 | d="m 130.717,131.434 23.333,-17.333 0.667,8 -17.667,16.333 -6.333,-7" /> | ||
344 | 331 | <path | ||
345 | 332 | inkscape:connector-curvature="0" | ||
346 | 333 | id="path68" | ||
347 | 334 | style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
348 | 335 | d="M 78.9508,5.09805 72.0496,33.102 68.6172,53.7648 68.0496,69.102 l 31.2348,1.6628 19.4326,0.0032 -1.767,-35.0032 3,-26.99996 -0.333,-5 -25.3326,-2 -15.3336,3.33321" /> | ||
349 | 336 | <path | ||
350 | 337 | inkscape:connector-curvature="0" | ||
351 | 338 | id="path70" | ||
352 | 339 | style="fill:#dcd9d8;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
353 | 340 | d="m 114.383,71.1012 c 0,0 -1.666,-34.6672 3.334,-59.3332 0,0 -10,-6.33402 -24.6674,-8.00003 l 28.0004,1 3.333,2 -4,54.66603 -1,11.668" /> | ||
354 | 341 | <path | ||
355 | 342 | inkscape:connector-curvature="0" | ||
356 | 343 | id="path72" | ||
357 | 344 | style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
358 | 345 | d="m 134.618,43.098 13,3.6668 24.666,1.3332 3.667,11.3329 -6.667,19.6671 -7.666,1 -10.667,-3.3332 -10.234,-4.9968 -5.433,0.9968 -4.234,-1.6636" /> | ||
359 | 346 | <path | ||
360 | 347 | inkscape:connector-curvature="0" | ||
361 | 348 | id="path74" | ||
362 | 349 | style="fill:#dcd9d8;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
363 | 350 | d="m 134.383,49.768 c 0,0 8.666,3.9992 10,3.666 l -3.666,18.334 4.333,1.666 c 0,0 3,-17.3328 3,-19.3328 0,0 18.666,-1 20.333,-1 0,0 4,7.6668 3,15.6668 l 3.667,-10.6668 0.333,-6 -5.333,-8 -6,-1.3332 -10,0.3332 -3.333,4.3328 -11.667,-1.666 -3.667,-1.334" /> | ||
364 | 351 | <path | ||
365 | 352 | inkscape:connector-curvature="0" | ||
366 | 353 | id="path76" | ||
367 | 354 | style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" | ||
368 | 355 | d="m 121.284,73.4309 -7.333,18.6671 -7.667,11 c 0,0 1.666,4.667 4,4.667 2.334,0 7.667,0 7.667,0 l 7.333,-2.667 -0.666,-12.3332 -3.334,-19.3339" /> | ||
369 | 356 | <path | ||
370 | 357 | inkscape:connector-curvature="0" | ||
371 | 358 | id="path78" | ||
372 | 359 | style="fill:#dcd9d8;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
373 | 360 | d="m 122.717,79.768 c 0,0 -9.334,17.9992 -9.334,20.666 0,0 1.666,4 4,3 2.334,-1 7.334,-3.666 7.334,-3.666 l 0,6.333 -11.334,2.334 -7.666,-1 13,-30.667 2.666,-0.334" /> | ||
374 | 361 | <path | ||
375 | 362 | inkscape:connector-curvature="0" | ||
376 | 363 | id="path80" | ||
377 | 364 | style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" | ||
378 | 365 | d="m 81.9512,123.764 -9.2344,1.004 -8.6672,2.667 0,-3 4.2348,-4.67 13.3332,-6" /> | ||
379 | 366 | <path | ||
380 | 367 | inkscape:connector-curvature="0" | ||
381 | 368 | id="path82" | ||
382 | 369 | style="fill:#dcd9d8;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
383 | 370 | d="m 67.0508,122.765 c 0,0 10.334,-4.334 13.6672,-3.334 l 0.3316,-3.996 -9.3316,1.996 -5.6672,4 1,1.334" /> | ||
384 | 371 | <path | ||
385 | 372 | inkscape:connector-curvature="0" | ||
386 | 373 | id="path84" | ||
387 | 374 | style="fill:#d33833;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
388 | 375 | d="m 134.582,106.63 c -5.656,0.166 -10.766,0.838 -15.24,2.1 0.304,1.834 -0.265,3.634 0.192,4.955 1.247,0.898 3.337,0.884 5.222,1.095 -1.63,0.801 -3.92,1.118 -5.801,0.655 -0.044,1.273 -0.615,2.062 -0.961,3.058 3.18,1.135 10.687,8.576 14.91,6.112 2.012,-1.172 2.867,-7.866 3.023,-11.121 0.13,-2.7 -0.245,-5.424 -1.345,-6.854" /> | ||
389 | 376 | <path | ||
390 | 377 | inkscape:connector-curvature="0" | ||
391 | 378 | id="path86" | ||
392 | 379 | style="fill:none;stroke:#d33833;stroke-width:8.20672035;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" | ||
393 | 380 | d="m 134.582,106.63 c -5.656,0.166 -10.766,0.838 -15.24,2.1 0.304,1.834 -0.265,3.634 0.192,4.955 1.247,0.898 3.337,0.884 5.222,1.095 -1.63,0.801 -3.92,1.118 -5.801,0.655 -0.044,1.273 -0.615,2.062 -0.961,3.058 3.18,1.135 10.687,8.576 14.91,6.112 2.012,-1.172 2.867,-7.866 3.023,-11.121 0.13,-2.7 -0.245,-5.424 -1.345,-6.854 z" /> | ||
394 | 381 | <path | ||
395 | 382 | inkscape:connector-curvature="0" | ||
396 | 383 | id="path88" | ||
397 | 384 | style="fill:#d33833;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
398 | 385 | d="m 107.535,115.876 c -0.015,-0.428 -0.033,-0.859 -0.05,-1.291 -1.766,-1.16 -4.617,-1.146 -6.555,-2.121 2.857,-0.125 5.106,-0.813 7.052,-1.783 -0.043,-1.078 -0.084,-2.155 -0.126,-3.233 -3.237,-2.216 -6.194,-5.516 -10.0052,-7.5941 -1.802,-0.9828 -8.1262,-3.5117 -10.0434,-3.0648 -1.0847,0.2519 -1.1824,1.598 -1.616,2.8668 -0.9238,2.7171 -3.0508,7.0421 -3.2363,11.1321 -0.2363,5.166 -0.7578,13.824 4.8094,12.76 4.4914,-0.857 9.7152,-2.926 13.1925,-4.826 2.125,-1.162 3.354,-2.598 6.578,-2.846" /> | ||
399 | 386 | <path | ||
400 | 387 | inkscape:connector-curvature="0" | ||
401 | 388 | id="path90" | ||
402 | 389 | style="fill:none;stroke:#d33833;stroke-width:8.20672035;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" | ||
403 | 390 | d="m 107.535,115.876 c -0.015,-0.428 -0.033,-0.859 -0.05,-1.291 -1.766,-1.16 -4.617,-1.146 -6.555,-2.121 2.857,-0.125 5.106,-0.813 7.052,-1.783 -0.043,-1.078 -0.084,-2.155 -0.126,-3.233 -3.237,-2.216 -6.194,-5.516 -10.0052,-7.5941 -1.802,-0.9828 -8.1262,-3.5117 -10.0434,-3.0648 -1.0847,0.2519 -1.1824,1.598 -1.616,2.8668 -0.9238,2.7171 -3.0508,7.0421 -3.2363,11.1321 -0.2363,5.166 -0.7578,13.824 4.8094,12.76 4.4914,-0.857 9.7152,-2.926 13.1925,-4.826 2.125,-1.162 3.354,-2.598 6.578,-2.846 z" /> | ||
404 | 391 | <path | ||
405 | 392 | inkscape:connector-curvature="0" | ||
406 | 393 | id="path92" | ||
407 | 394 | style="fill:#d33833;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
408 | 395 | d="m 110.75,109.712 c -0.494,2.814 -1.065,3.617 -0.844,6.072 7.505,5.004 8.914,-8.595 0.844,-6.072" /> | ||
409 | 396 | <path | ||
410 | 397 | inkscape:connector-curvature="0" | ||
411 | 398 | id="path94" | ||
412 | 399 | style="fill:none;stroke:#d33833;stroke-width:8.20672035;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" | ||
413 | 400 | d="m 110.75,109.712 c -0.494,2.814 -1.065,3.617 -0.844,6.072 7.505,5.004 8.914,-8.595 0.844,-6.072 z" /> | ||
414 | 401 | <path | ||
415 | 402 | inkscape:connector-curvature="0" | ||
416 | 403 | id="path96" | ||
417 | 404 | style="fill:#ef3d3a;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
418 | 405 | d="m 121.617,107.431 c 0,0 -2.334,3.334 -0.667,4.334 1.667,1 3.334,-0.001 4.334,1.666 1,1.667 0,2.667 0.333,4.667 0.333,2 2.001,2.334 3.667,2.667 1.666,0.333 6.334,1 7,-0.667 l -2,6 -4,1.333 -12.667,-7.333 -0.667,-3.667 0,-7.333" /> | ||
419 | 406 | <path | ||
420 | 407 | inkscape:connector-curvature="0" | ||
421 | 408 | id="path98" | ||
422 | 409 | style="fill:#ef3d3a;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
423 | 410 | d="m 86.6172,96.4309 c -0.4004,5.2021 -0.8242,10.3971 -1.2957,15.5941 -0.7055,7.76 1.864,6.406 8.5906,6.406 1.0274,0 6.3259,-1.225 6.7049,-2 1.818,-3.713 -3.04,-2.888 2.094,-5.688 4.334,-2.363 11.99,1.435 10.239,6.688 -0.98,1.168 -5.106,0.364 -6.585,1.131 -2.604,1.35 -5.208,2.7 -7.8123,4.05 -3.3132,1.719 -10.9707,4.225 -14.5031,1.823 -8.9504,-6.087 0.5649,-21.296 3.7578,-27.6459" /> | ||
424 | 411 | <path | ||
425 | 412 | inkscape:connector-curvature="0" | ||
426 | 413 | id="path100" | ||
427 | 414 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
428 | 415 | d="m 95.3887,214.532 c -9.0852,2.116 -13.5996,-3.802 -16.3535,-9.94 -2.459,0.596 -1.4805,3.94 -0.8594,5.644 1.6262,4.472 8.1797,10.425 13.5344,9.618 2.3043,-0.347 5.4226,-2.454 3.6785,-5.322" /> | ||
429 | 416 | <path | ||
430 | 417 | inkscape:connector-curvature="0" | ||
431 | 418 | id="path102" | ||
432 | 419 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
433 | 420 | d="m 139.655,204.186 c 0.143,-0.006 0.288,-0.011 0.431,-0.017 2.053,-4.265 3.83,-8.783 6.42,-12.548 -1.735,-4.041 -13.138,-7.617 -12.962,-0.361 2.466,1.078 6.723,0.22 8.909,1.597 -1.264,3.469 -3.088,6.422 -2.798,11.329" /> | ||
434 | 421 | <path | ||
435 | 422 | inkscape:connector-curvature="0" | ||
436 | 423 | id="path104" | ||
437 | 424 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
438 | 425 | d="m 100.04,204.075 c 1.948,-3.571 2.582,-7.323 5.351,-10.022 1.247,-1.215 3.672,-2.696 2.47,-6.075 -0.281,-0.797 -2.334,-2.574 -3.519,-2.923 -4.329,-1.278 -14.4162,-0.264 -11.0002,5.133 3.5801,-0.167 8.3922,-2.325 11.0682,0.274 -2.055,3.285 -5.7186,9.784 -4.37,13.613" /> | ||
439 | 426 | <path | ||
440 | 427 | inkscape:connector-curvature="0" | ||
441 | 428 | id="path106" | ||
442 | 429 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
443 | 430 | d="m 138.03,167.781 c -6.518,-4.187 -13.786,-8.74 -24.466,-7.684 -2.282,1.984 -3.152,6.399 -0.935,9.315 1.154,-1.984 0.429,-5.633 3.645,-6.182 6.06,-1.037 13.113,3.707 17.472,5.365 2.703,4.557 -0.233,6.233 -2.668,9.166 -4.985,6.009 -11.672,13.457 -11.429,22.453 2.015,1.461 2.189,-2.23 2.478,-2.902 2.603,-6.092 9.154,-13.883 13.935,-19.097 1.174,-1.284 3.107,-2.516 3.322,-3.365 0.62,-2.469 -1.613,-5.427 -1.354,-7.069" /> | ||
444 | 431 | <path | ||
445 | 432 | inkscape:connector-curvature="0" | ||
446 | 433 | id="path108" | ||
447 | 434 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
448 | 435 | d="m 52.1016,172.189 c -2.043,1.166 -2.5293,6.302 -4.9278,6.448 -3.4277,0.208 -2.8027,-6.663 -2.789,-10.681 -2.3594,2.142 -2.7743,8.737 -1.041,12.124 -1.9754,0.97 -2.8575,-1.07 -3.9532,-1.789 1.4082,10.23 14.9649,4.745 12.711,-6.102" /> | ||
449 | 436 | <path | ||
450 | 437 | inkscape:connector-curvature="0" | ||
451 | 438 | id="path110" | ||
452 | 439 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
453 | 440 | d="m 142.18,163.521 c -3.034,-5.775 -7.326,-12.135 -16.229,-12.32 -0.181,1.865 -0.32,4.703 0.01,5.826 6.806,0.654 11.008,4.118 16.219,6.494" /> | ||
454 | 441 | <path | ||
455 | 442 | inkscape:connector-curvature="0" | ||
456 | 443 | id="path112" | ||
457 | 444 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
458 | 445 | d="m 99.5266,159.777 c 5.6784,-2.986 16.1144,-3.307 23.8324,-3.081 0.414,-1.691 0.404,-3.78 0.42,-5.842 -9.921,-0.495 -21.651,1.96 -24.2524,8.923" /> | ||
459 | 446 | <path | ||
460 | 447 | inkscape:connector-curvature="0" | ||
461 | 448 | id="path114" | ||
462 | 449 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
463 | 450 | d="m 98.4473,154.209 c 3.9267,-9.859 17.4227,-8.724 28.8037,-8.452 -0.501,-1.28 -1.587,-2.792 -2.937,-3.339 -3.647,-1.484 -13.706,-2.61 -18.769,0.079 -3.211,1.707 -5.274,5.564 -7.0333,7.825 -0.8496,1.092 -5.0801,3.881 -0.0644,3.887" /> | ||
464 | 451 | <path | ||
465 | 452 | inkscape:connector-curvature="0" | ||
466 | 453 | id="path116" | ||
467 | 454 | style="fill:#81b0c4;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
468 | 455 | d="m 137.556,99.8262 c -4.608,-7.8922 -9.017,-15.9981 -14.484,-22.9594 2.292,6.7391 3.273,18.0184 3.619,26.6172 4.795,2.244 8.901,-0.505 10.865,-3.6578" /> | ||
469 | 456 | <path | ||
470 | 457 | inkscape:connector-curvature="0" | ||
471 | 458 | id="path118" | ||
472 | 459 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
473 | 460 | d="m 162.352,71.4609 c -5.159,-1.0328 -8.784,-6.0468 -13.817,-5.725 2.766,3.8993 7.613,5.543 13.817,5.725" /> | ||
474 | 461 | <path | ||
475 | 462 | inkscape:connector-curvature="0" | ||
476 | 463 | id="path120" | ||
477 | 464 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
478 | 465 | d="m 164.628,63.3871 c -4.205,-0.4441 -9.144,-1.125 -13.409,-0.7742 2.019,3.084 9.798,2.0199 13.409,0.7742" /> | ||
479 | 466 | <path | ||
480 | 467 | inkscape:connector-curvature="0" | ||
481 | 468 | id="path122" | ||
482 | 469 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
483 | 470 | d="m 166.085,56.4262 c -4.726,-0.1024 -10.6,-0.0082 -15.092,0.3687 2.657,2.8539 12.027,1.059 15.092,-0.3687" /> | ||
484 | 471 | <path | ||
485 | 472 | inkscape:connector-curvature="0" | ||
486 | 473 | id="path124" | ||
487 | 474 | style="fill:#dcd9d8;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
488 | 475 | d="m 128.664,37.377 c 0.678,-5.9352 3.031,-11.9489 2.736,-18.4489 -2.613,-0.8812 -4.114,-1.6519 -7.615,-1.6472 -0.247,5.5242 -0.986,13.9691 -0.765,19.2351 1.722,-0.114 4.261,1.2301 5.644,0.861" /> | ||
489 | 476 | <path | ||
490 | 477 | inkscape:connector-curvature="0" | ||
491 | 478 | id="path126" | ||
492 | 479 | style="fill:#f0d6b7;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
493 | 480 | d="m 121.045,124.849 c -2.373,-1.549 -4.394,-3.483 -6.673,-5.137 -5.054,-0.25 -7.812,0.35 -11.525,3.252 0.061,0.233 0.434,0.129 0.448,0.415 5.41,-2.411 12.287,0.982 17.75,1.47" /> | ||
494 | 481 | <path | ||
495 | 482 | inkscape:connector-curvature="0" | ||
496 | 483 | id="path128" | ||
497 | 484 | style="fill:#81b0c4;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
498 | 485 | d="m 92.6445,87.9711 c 1.4864,6.441 7.3106,9.7769 12.5995,13.3239 5.459,-6.9282 8.779,-15.838 12.435,-24.436 -8.638,2.6039 -17.464,6.8289 -25.0345,11.1121" /> | ||
499 | 486 | <path | ||
500 | 487 | inkscape:connector-curvature="0" | ||
501 | 488 | id="path130" | ||
502 | 489 | style="fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
503 | 490 | d="m 123.02,36.516 c -0.221,-5.266 0.518,-13.7109 0.765,-19.2351 3.501,-0.0047 5.002,0.766 7.615,1.6472 0.295,6.5 -2.058,12.5137 -2.736,18.4489 -1.383,0.3691 -3.922,-0.975 -5.644,-0.861 z M 68.5059,66.4648 C 70.8145,45.2418 74.1582,27.4012 80.291,8.60781 93.9023,4.475 110.311,4.11484 122.342,7.84414 120.133,18.4512 121.098,31.3648 119.807,42.684 c -0.973,8.5078 -0.477,17.068 -1.811,25.748 -14.578,3.0328 -35.1835,0.709 -49.4901,-1.9672 z m 52.9371,1.834 c -0.123,-9.1148 0.408,-18.1058 1.104,-27.232 3.5,0.5254 5.875,0.8762 9.127,1.5891 -1.056,8.7859 -0.926,18.6722 -3.077,26.4441 -2.486,-0.0238 -4.675,0.0289 -7.154,-0.8012 z m 17.755,1.4692 c -1.661,0.3808 -3.595,0.0148 -5.182,-0.016 0.746,-7.4301 2.556,-15.629 3.193,-23.4282 2.497,-0.0777 3.831,1.1 5.885,1.4961 0.11,6.8461 -0.598,16.2781 -3.896,21.9481 z m 26.884,-24.5629 c 5.205,1.264 8.478,7.639 7.022,14.1859 -0.977,4.4 -2.717,12.6852 -4.579,15.5 -1.376,2.082 -5.107,4.8078 -8.086,2.9 -4.846,-3.1031 -13.383,-4.0039 -16.917,-7.7601 1.772,-5.9 2.322,-14.0039 3.053,-21.4797 6.054,-0.3774 13.503,1.666 18.538,-0.5024 -3.515,-1.1386 -8.076,-1.1476 -11.113,-2.807 2.482,-1.1988 8.293,-0.9566 12.082,-0.0367 z M 117.679,76.859 c -3.656,8.598 -6.976,17.5078 -12.435,24.436 C 99.9551,97.748 94.1309,94.4121 92.6445,87.9711 100.215,83.6879 109.041,79.4629 117.679,76.859 z m 9.012,26.625 c -0.346,-8.5988 -1.327,-19.8781 -3.619,-26.6172 5.467,6.9613 9.876,15.0672 14.484,22.9594 -1.964,3.1528 -6.07,5.9018 -10.865,3.6578 z m -10.216,3.63 c -2.071,0.223 -3.829,-2.381 -6.522,-1.255 -0.617,-0.682 -1.178,-1.421 -1.807,-2.087 5.948,-7.1681 8.651,-17.338 13.245,-25.7618 2.465,8.0918 2.181,16.957 2.724,25.7888 -3.387,-0.215 -5.266,3.063 -7.64,3.315 z m -6.569,8.67 c -0.221,-2.455 0.35,-3.258 0.844,-6.072 8.07,-2.523 6.661,11.076 -0.844,6.072 z m -8.949,2.938 c -3.4773,1.9 -8.7011,3.969 -13.1925,4.826 -5.5672,1.065 -5.0457,-7.594 -4.8094,-12.76 0.1855,-4.09 2.3125,-8.415 3.2363,-11.1321 0.4336,-1.2688 0.5313,-2.6149 1.616,-2.8668 1.9172,-0.4469 8.2414,2.082 10.0434,3.0648 3.8112,2.0781 6.7682,5.3781 10.0052,7.5941 0.042,1.078 0.083,2.155 0.126,3.233 -1.946,0.97 -4.195,1.658 -7.052,1.783 1.938,0.975 4.789,0.961 6.555,2.121 0.017,0.432 0.035,0.863 0.05,1.291 -3.224,0.248 -4.453,1.684 -6.578,2.846 z m -33.2136,6.033 c -2.886,-2.93 8.0945,-6.924 11.5906,-7.139 -0.0195,1.854 1.0566,3.602 0.8398,4.932 -4.1523,0.729 -9.6093,0.248 -12.4304,2.207 z m 35.5516,-1.376 c -0.014,-0.286 -0.387,-0.182 -0.448,-0.415 3.713,-2.902 6.471,-3.502 11.525,-3.252 2.279,1.654 4.3,3.588 6.673,5.137 -5.463,-0.488 -12.34,-3.881 -17.75,-1.47 z m 32.632,-9.895 c -0.156,3.255 -1.011,9.949 -3.023,11.121 -4.223,2.465 -11.73,-4.977 -14.91,-6.112 0.346,-0.996 0.917,-1.785 0.961,-3.058 1.881,0.463 4.171,0.146 5.801,-0.655 -1.885,-0.211 -3.975,-0.197 -5.222,-1.095 -0.457,-1.321 0.112,-3.121 -0.192,-4.955 4.474,-1.262 9.584,-1.934 15.24,-2.1 1.1,1.43 1.475,4.154 1.345,6.854 z m -73.0422,8.437 c -0.9063,0.646 -7.0371,8.623 -7.877,8.292 C 43.9141,125.838 33.541,118.273 24.2715,111.118 33.1094,92.1539 36.677,68.9199 37.3074,46.5262 47.4316,41.791 56.3242,34.9648 70.0625,34.252 68.4727,45.5 67.0215,55.5352 66.1191,66.125 c -3.4519,1.4551 -8.4043,-0.066 -11.6347,0.4512 -0.0274,3.8929 4.9336,1.7047 5.3468,4.3226 0.3114,1.9801 -2.7296,2.1301 -1.7394,5.2481 2.5254,-0.918 3.8516,-2.9457 6.5449,-3.7071 2.461,5.384 -0.0344,14.9102 0.3203,19.4102 0.0672,0.8449 0.4219,4.6809 2.3145,4.0078 1.675,-0.5957 -0.0957,-10.2019 0.0879,-14.4609 0.1672,-3.9239 -0.4739,-7.7207 1.1152,-10.184 13.2754,1.807 26.7656,2.975 41.1294,3.3691 -3.16,1.3559 -6.914,2.6391 -11.0298,4.959 -2.2312,1.2578 -9.2644,3.875 -9.9082,5.9942 -1.0273,3.3769 2.6953,5.1757 3.332,8.0707 -6.7011,-3.6547 -8.0085,3.5031 -9.5937,8.5741 -1.4363,4.593 -2.2539,8.024 -2.6063,10.673 -5.7726,2.752 -11.9445,5.539 -16.9132,9.068 z m 67.1792,7.327 c 9.243,4.482 10.909,-16.751 7.286,-23.591 0.56,-2.04 2.486,-2.821 3.272,-4.655 -5.158,-9.2399 -10.887,-17.8649 -16.15,-26.9961 3.915,2.4371 9.507,0.4359 14.114,2.2601 1.684,0.666 2.903,4.5211 4.178,7.6051 3.507,8.4848 7.189,19.1819 8.827,27.2789 0.37,1.845 1.378,5.865 1.152,7.507 -0.403,2.94 -4.392,5.12 -6.421,6.938 -3.738,3.358 -6.092,6.313 -9.991,9.453 -1.581,-2.334 -4.974,-3.902 -6.267,-5.8 z m -88.3179,81.968 c -4.4043,-4.846 -3.4824,-13.926 -2.9492,-20.386 7.9609,5.008 18.5273,-0.396 18.4277,-8.914 3.8008,0.101 1.4199,4.747 0.7324,7.74 -2.2468,9.776 3.7852,20.397 0.2735,29.337 -6.8184,-0.517 -12.42,-3.302 -16.4844,-7.777 z m 31.5137,28.126 c -9.9707,-2.826 -22.7493,-10.071 -26.8465,-19.028 3.1726,0.461 5.375,2.061 8.5047,2.259 1.1828,0.077 2.7324,-0.496 4.0918,-0.158 2.709,0.672 4.9953,6.746 7.039,9.006 1.9922,2.207 4.3867,3.15 6.0254,5.162 1.0528,0.508 2.6094,0.473 2.6692,2.054 -0.4563,0.488 -0.9368,0.86 -1.4836,0.705 z m 51.9032,-2.658 c -10.349,5.839 -27.8661,10.231 -38.8747,4.743 -8.8828,-4.429 -20.8899,-11.757 -24.9836,-21.043 3.8242,-8.961 -1.1328,-17.172 -1.4492,-26.27 -0.168,-4.841 2.2793,-9.067 2.4668,-14.337 -1.3086,-2.159 -5.3067,-2.425 -8.0743,-2.277 -0.9316,4.662 -2.5625,9.902 -7.3632,10.428 -6.793,0.743 -11.7598,-4.879 -12.0684,-10.754 -0.3652,-6.909 5.3066,-18.36 13.3457,-17.565 3.1055,0.307 3.8684,3.42 7.252,3.388 1.8339,-3.659 -2.8289,-4.808 -3.3086,-7.425 -0.125,-0.676 0.3867,-3.318 0.6843,-4.557 1.4602,-6.033 4.7153,-13.841 7.9192,-18.434 4.0664,-5.826 12.0555,-6.704 20.6504,-7.275 1.5351,3.307 7.1902,3.035 10.875,2.17 -4.416,1.749 -8.5215,5.989 -11.9239,9.742 -3.9082,4.306 -7.8671,8.925 -8.0671,14.553 7.3855,-10.246 13.4871,-19.194 26.9168,-23.701 10.1618,-3.408 22.0298,1.562 29.8378,7.045 3.24,2.279 5.174,5.895 7.477,9.205 8.617,12.395 12.638,30.087 11.754,47.235 -0.364,7.072 -0.348,14.12 -2.721,18.878 -2.48,4.975 -10.868,9.426 -15.778,4.926 -0.91,4.838 4.083,7.83 9.948,6.089 -4.182,5.397 -8.571,11.882 -14.515,15.236 z M 144.444,77.1168 c 8.087,4.0203 23.197,10.8211 28.267,-0.0148 1.871,-3.9942 4.066,-10.7461 5.035,-14.8692 1.369,-5.8168 -1.484,-18.043 -7.463,-19.9949 -5.281,-1.7238 -11.443,-1.6188 -17.804,-0.341 -0.749,0.623 -1.583,1.709 -2.166,2.841 -4.542,0.1762 -8.795,-0.2438 -12.383,-2.1109 0.34,-3.359 -1.932,-3.8981 -4.062,-4.5899 -1.579,-6.2609 3.159,-14.4371 2.025,-20.1461 -0.809,-4.0672 -5.813,-4.6961 -9.491,-5.457 -0.12,-2.2602 0.161,-4.14689 0.412,-6.059 -0.841,-3.09883 -4.613,-4.86289 -8.187,-5.29492 -11.759,-1.414064 -29.6133,-2.049221 -40.9239,2.01797 -3.1562,7.74175 -5.6426,17.15785 -8.2715,25.99805 -11.0312,-1.1781 -19.9531,4.7598 -28.364,8.65 -2.9121,1.35 -6.9406,2.0937 -8.0285,4.4117 -1.0547,2.2442 -0.6231,6.5453 -0.8848,10.6082 -0.666,10.377 -1.2363,20.386 -3.9766,31.011 -1.2304,4.7679 -3.375,8.975 -4.8711,13.5691 -1.3828,4.2579 -3.7988,9.5199 -4.4289,13.7659 -0.9343,6.293 4.9914,6.643 8.7805,9.37 5.8574,4.217 10.4551,6.549 16.7988,10.355 1.8789,1.127 7.545,3.98 8.1895,5.294 1.2812,2.605 -2.1992,6.278 -3.1297,8.32 -1.4719,3.229 -2.2395,5.972 -2.4504,9.158 -5.3215,0.841 -9.3555,4.008 -11.7922,7.579 -4.0308,5.91 -6.8262,16.844 -3.3387,25.161 0.2735,0.655 1.6375,1.943 1.8387,2.949 0.3969,1.981 -0.7469,4.615 -0.818,6.722 -0.3664,10.81 1.829,20.124 9.1063,23.384 2.9543,11.769 13.5281,15.682 23.4902,21.531 3.7239,2.186 7.8289,3.583 12.0684,5.143 15.2082,5.597 38.5419,4.543 51.1639,-5.003 5.352,-4.048 13.907,-12.595 16.967,-18.783 8.082,-16.337 7.508,-43.64 1.855,-63.513 -0.76,-2.668 -1.862,-6.59 -3.401,-9.795 -1.073,-2.238 -4.408,-6.716 -4.003,-8.692 0.417,-2.043 7.604,-7.5 9.145,-8.986 2.775,-2.677 8.047,-6.23 8.474,-9.608 0.459,-3.595 -1.584,-8.513 -2.619,-11.982 -3.46,-11.5769 -6.836,-22.2781 -10.759,-32.5992" /> | ||
504 | 491 | <path | ||
505 | 492 | inkscape:connector-curvature="0" | ||
506 | 493 | id="path132" | ||
507 | 494 | style="fill:#f7e4cd;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
508 | 495 | d="m 90.491,157.255 c 0.4387,0.584 2.8508,1.471 6.2258,-0.154 0,0 -4,-0.667 -3.6672,-7.336 l -1.6668,0.334 c 0,0 -1.7226,6.047 -0.8918,7.156" /> | ||
509 | 496 | <path | ||
510 | 497 | inkscape:connector-curvature="0" | ||
511 | 498 | id="path134" | ||
512 | 499 | style="fill:#1d1919;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
513 | 500 | d="m 119.717,99.934 c 0,-1.0121 -0.821,-1.8328 -1.834,-1.8328 -1.012,0 -1.833,0.8207 -1.833,1.8328 0,1.012 0.821,1.834 1.833,1.834 1.013,0 1.834,-0.822 1.834,-1.834" /> | ||
514 | 501 | <path | ||
515 | 502 | inkscape:connector-curvature="0" | ||
516 | 503 | id="path136" | ||
517 | 504 | style="fill:#1d1919;fill-opacity:1;fill-rule:evenodd;stroke:none" | ||
518 | 505 | d="m 121.55,91.434 c 0,-1.0121 -0.821,-1.8328 -1.834,-1.8328 -1.012,0 -1.833,0.8207 -1.833,1.8328 0,1.0121 0.821,1.834 1.833,1.834 1.013,0 1.834,-0.8219 1.834,-1.834" /> | ||
519 | 506 | </g> | ||
520 | 507 | </g> | ||
521 | 508 | <text | ||
522 | 509 | xml:space="preserve" | ||
523 | 510 | style="font-size:15px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" | ||
524 | 511 | x="-236.76514" | ||
525 | 512 | y="715.29077" | ||
526 | 513 | id="text3081" | ||
527 | 514 | sodipodi:linespacing="125%"><tspan | ||
528 | 515 | sodipodi:role="line" | ||
529 | 516 | id="tspan3083" | ||
530 | 517 | x="-236.76514" | ||
531 | 518 | y="715.29077">Slave</tspan></text> | ||
532 | 519 | </g> | ||
533 | 520 | <g | ||
534 | 521 | inkscape:groupmode="layer" | ||
535 | 522 | id="layer3" | ||
536 | 523 | inkscape:label="PLACE YOUR PICTOGRAM HERE" | ||
537 | 524 | style="display:inline" /> | ||
538 | 525 | <g | ||
539 | 526 | inkscape:groupmode="layer" | ||
540 | 527 | id="layer2" | ||
541 | 528 | inkscape:label="BADGE" | ||
542 | 529 | style="display:none" | ||
543 | 530 | sodipodi:insensitive="true"> | ||
544 | 531 | <g | ||
545 | 532 | style="display:inline" | ||
546 | 533 | transform="translate(-340.00001,-581)" | ||
547 | 534 | id="g4394" | ||
548 | 535 | clip-path="none"> | ||
549 | 536 | <g | ||
550 | 537 | id="g855"> | ||
551 | 538 | <g | ||
552 | 539 | inkscape:groupmode="maskhelper" | ||
553 | 540 | id="g870" | ||
554 | 541 | clip-path="url(#clipPath873)" | ||
555 | 542 | style="opacity:0.6;filter:url(#filter891)"> | ||
556 | 543 | <path | ||
557 | 544 | transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)" | ||
558 | 545 | d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" | ||
559 | 546 | sodipodi:ry="12" | ||
560 | 547 | sodipodi:rx="12" | ||
561 | 548 | sodipodi:cy="552.36218" | ||
562 | 549 | sodipodi:cx="252" | ||
563 | 550 | id="path844" | ||
564 | 551 | style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
565 | 552 | sodipodi:type="arc" /> | ||
566 | 553 | </g> | ||
567 | 554 | <g | ||
568 | 555 | id="g862"> | ||
569 | 556 | <path | ||
570 | 557 | sodipodi:type="arc" | ||
571 | 558 | style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
572 | 559 | id="path4398" | ||
573 | 560 | sodipodi:cx="252" | ||
574 | 561 | sodipodi:cy="552.36218" | ||
575 | 562 | sodipodi:rx="12" | ||
576 | 563 | sodipodi:ry="12" | ||
577 | 564 | d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" | ||
578 | 565 | transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" /> | ||
579 | 566 | <path | ||
580 | 567 | transform="matrix(1.25,0,0,1.25,33,-100.45273)" | ||
581 | 568 | d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z" | ||
582 | 569 | sodipodi:ry="12" | ||
583 | 570 | sodipodi:rx="12" | ||
584 | 571 | sodipodi:cy="552.36218" | ||
585 | 572 | sodipodi:cx="252" | ||
586 | 573 | id="path4400" | ||
587 | 574 | style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
588 | 575 | sodipodi:type="arc" /> | ||
589 | 576 | <path | ||
590 | 577 | sodipodi:type="star" | ||
591 | 578 | style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" | ||
592 | 579 | id="path4459" | ||
593 | 580 | sodipodi:sides="5" | ||
594 | 581 | sodipodi:cx="666.19574" | ||
595 | 582 | sodipodi:cy="589.50385" | ||
596 | 583 | sodipodi:r1="7.2431178" | ||
597 | 584 | sodipodi:r2="4.3458705" | ||
598 | 585 | sodipodi:arg1="1.0471976" | ||
599 | 586 | sodipodi:arg2="1.6755161" | ||
600 | 587 | inkscape:flatsided="false" | ||
601 | 588 | inkscape:rounded="0.1" | ||
602 | 589 | inkscape:randomized="0" | ||
603 | 590 | d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z" | ||
604 | 591 | transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" /> | ||
605 | 592 | </g> | ||
606 | 593 | </g> | ||
607 | 594 | </g> | ||
608 | 595 | </g> | ||
609 | 596 | </svg> | ||
610 | 0 | 597 | ||
611 | === modified file 'metadata.yaml' | |||
612 | --- metadata.yaml 2012-05-22 11:06:20 +0000 | |||
613 | +++ metadata.yaml 2014-04-05 18:46:28 +0000 | |||
614 | @@ -1,4 +1,3 @@ | |||
615 | 1 | ensemble: formula | ||
616 | 2 | name: jenkins-slave | 1 | name: jenkins-slave |
617 | 3 | maintainer: James Page <james.page@ubuntu.com> | 2 | maintainer: James Page <james.page@ubuntu.com> |
618 | 4 | summary: Jenkins CI Slave | 3 | summary: Jenkins CI Slave |
619 | @@ -8,6 +7,8 @@ | |||
620 | 8 | and more. | 7 | and more. |
621 | 9 | . | 8 | . |
622 | 10 | This formula provides support for jenkins slaves | 9 | This formula provides support for jenkins slaves |
623 | 10 | categories: | ||
624 | 11 | - applications | ||
625 | 11 | provides: | 12 | provides: |
626 | 12 | slave: | 13 | slave: |
627 | 13 | interface: jenkins-slave | 14 | interface: jenkins-slave |
Greetings Jose,
Thank you for this submission! I've reviewed the changes and have the following notes:
The README doesn't really tell the user anything about the configuration options, or how to deploy the jenkins slave charm and how it relates to Jenkins master.
The icon should match the Jenkins master charm icon, with the addition of a callout that its the slave charm (akin to the slave text you have at the base of this icon).
Thanks again for the submission. I'm going to change status of this MP to "needs work" and when you're ready for another review please click the "Request another review" button in the upper right hand corner of the commit message.
If you have any questions/ comments/ concerns about the review contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>