Merge branch 'master' into develop

This commit is contained in:
STAM 2020-01-30 12:33:15 +03:00
commit 26ae0fe4dc
2 changed files with 78 additions and 31 deletions

View File

@ -1,34 +1,42 @@
<mxfile host="www.draw.io" modified="2020-01-29T13:07:26.073Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" etag="TWUgsUc1vqtJzjcLC_Ma" version="12.6.1" type="github">
<mxfile host="www.draw.io" modified="2020-01-30T09:14:56.070Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36" etag="7B7NZGoznvGP_xGTzUoh" version="12.6.2" type="github">
<diagram name="Page-1" id="9f46799a-70d6-7492-0946-bef42562c5a5">
<mxGraphModel dx="1406" dy="784" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="850" background="#ffffff" math="0" shadow="0">
<mxGraphModel dx="1654" dy="865" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1100" pageHeight="850" background="#ffffff" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
<mxCell id="GupPUEsqrWVPhIxHysfE-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-3" target="GupPUEsqrWVPhIxHysfE-14" edge="1">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.25;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-3" target="GupPUEsqrWVPhIxHysfE-13" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="779.53" y="300"/>
<mxPoint x="1024.53" y="300"/>
<mxPoint x="874" y="620"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-38" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-3" target="GupPUEsqrWVPhIxHysfE-31" edge="1">
<mxCell id="GupPUEsqrWVPhIxHysfE-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" target="GupPUEsqrWVPhIxHysfE-13" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="714.53" y="340"/>
<mxPoint x="649.53" y="340"/>
<mxPoint x="649.53" y="380"/>
<mxPoint x="779.53" y="620"/>
<mxPoint x="1024.53" y="620"/>
</Array>
<mxPoint x="780" y="620" as="sourcePoint"/>
</mxGeometry>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-10" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="GupPUEsqrWVPhIxHysfE-3" target="GupPUEsqrWVPhIxHysfE-20">
<mxGeometry relative="1" as="geometry">
<mxPoint x="720" y="580" as="sourcePoint"/>
<Array as="points">
<mxPoint x="714" y="590"/>
<mxPoint x="805" y="590"/>
<mxPoint x="805" y="460"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-3" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;develop&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="649.53" y="270" width="130" height="60" as="geometry"/>
<mxGeometry x="649.53" y="600" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-27" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-5" target="GupPUEsqrWVPhIxHysfE-3" edge="1">
<mxGeometry relative="1" as="geometry"/>
<mxCell id="GupPUEsqrWVPhIxHysfE-27" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-5" target="wDtG2ugJA-Ccp97bahZy-3" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="730" y="200" as="targetPoint"/>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-28" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-5" target="GupPUEsqrWVPhIxHysfE-7" edge="1">
<mxGeometry relative="1" as="geometry"/>
@ -80,32 +88,22 @@
<mxGeometry x="309.53" y="270" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-11" value="&lt;span style=&quot;white-space: nowrap&quot;&gt;&lt;b&gt;teamcity-agent&lt;/b&gt;&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="829.53" y="430" width="110" height="60" as="geometry"/>
<mxGeometry x="829.53" y="750" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-14" target="GupPUEsqrWVPhIxHysfE-11" edge="1">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="875" y="400"/>
<mxPoint x="810" y="400"/>
<mxPoint x="810" y="460"/>
<mxPoint x="875" y="720"/>
<mxPoint x="810" y="720"/>
<mxPoint x="810" y="780"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-13" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;develop&lt;/span&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;:jdk11&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="959.53" y="320" width="130" height="60" as="geometry"/>
<mxGeometry x="959.53" y="640" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-14" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;develop:jdk8&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
<mxGeometry x="809.53" y="320" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-40" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-3" target="GupPUEsqrWVPhIxHysfE-20" edge="1">
<mxGeometry relative="1" as="geometry">
<mxPoint x="489.53" y="340" as="sourcePoint"/>
<Array as="points">
<mxPoint x="715" y="340"/>
<mxPoint x="650" y="340"/>
<mxPoint x="650" y="460"/>
</Array>
</mxGeometry>
<mxGeometry x="809.53" y="640" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="661J1RdMhrbpdGnhcWUA-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="GupPUEsqrWVPhIxHysfE-20" target="661J1RdMhrbpdGnhcWUA-2" edge="1">
<mxGeometry relative="1" as="geometry"/>
@ -150,7 +148,7 @@
<mxGeometry x="509.53" y="350" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-31" value="&lt;span style=&quot;white-space: nowrap&quot;&gt;&lt;b&gt;qbittorrent&lt;/b&gt;&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="669.53" y="350" width="110" height="60" as="geometry"/>
<mxGeometry x="669.53" y="360" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="GupPUEsqrWVPhIxHysfE-39" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;Jira&lt;br&gt;(default)&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="329.53" y="350" width="110" height="60" as="geometry"/>
@ -215,6 +213,55 @@
<mxCell id="bBdt5q1b351HwNWlHLfP-1" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;websites:php7.2&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;" parent="1" vertex="1">
<mxGeometry x="509.53" y="430" width="110" height="60" as="geometry"/>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="wDtG2ugJA-Ccp97bahZy-3" target="wDtG2ugJA-Ccp97bahZy-5">
<mxGeometry relative="1" as="geometry"/>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" target="wDtG2ugJA-Ccp97bahZy-4">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="779.53" y="300"/>
<mxPoint x="1024.53" y="300"/>
</Array>
<mxPoint x="780" y="300" as="sourcePoint"/>
</mxGeometry>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="wDtG2ugJA-Ccp97bahZy-3" target="GupPUEsqrWVPhIxHysfE-31">
<mxGeometry relative="1" as="geometry">
<mxPoint x="660" y="360" as="targetPoint"/>
<Array as="points">
<mxPoint x="714" y="340"/>
<mxPoint x="650" y="340"/>
<mxPoint x="650" y="390"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="wDtG2ugJA-Ccp97bahZy-3" target="GupPUEsqrWVPhIxHysfE-20">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="714" y="340"/>
<mxPoint x="650" y="340"/>
<mxPoint x="650" y="460"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="wDtG2ugJA-Ccp97bahZy-3" target="GupPUEsqrWVPhIxHysfE-3">
<mxGeometry relative="1" as="geometry">
<Array as="points">
<mxPoint x="714" y="340"/>
<mxPoint x="634" y="340"/>
<mxPoint x="634" y="630"/>
</Array>
</mxGeometry>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-3" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;edge&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
<mxGeometry x="649.53" y="270" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-4" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;edge&lt;/span&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;:jdk11&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
<mxGeometry x="959.53" y="320" width="130" height="60" as="geometry"/>
</mxCell>
<mxCell id="wDtG2ugJA-Ccp97bahZy-5" value="&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;edge&lt;/span&gt;&lt;span style=&quot;font-weight: 700 ; white-space: nowrap&quot;&gt;:jdk8&lt;/span&gt;" style="whiteSpace=wrap;html=1;align=center;verticalAlign=middle;container=1;recursiveResize=0;treeFolding=1;treeMoving=1;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
<mxGeometry x="809.53" y="320" width="130" height="60" as="geometry"/>
</mxCell>
</root>
</mxGraphModel>
</diagram>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 86 KiB