Skip to content

Commit 0b66f5a

Browse files
jbamptonjbampton
authored
pre-commit: remove trailing-whitespace from more file types (#10131)
1 parent 57867dc commit 0b66f5a

File tree

13 files changed

+69
-69
lines changed

13 files changed

+69
-69
lines changed

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ repos:
5959
- id: mixed-line-ending
6060
exclude: \.(cs|xml)$
6161
- id: trailing-whitespace
62-
files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|xml|yaml|yml)$
62+
files: \.(bat|css|gitignore|header|in|install|java|md|properties|py|rb|sh|sql|txt|vue|xml|xsl|yaml|yml)$
6363
args: [--markdown-linebreak-ext=md]
6464
exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
6565
- repo: https://github.com/codespell-project/codespell

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ $ git push origin main
103103
$ git push origin feature_x
104104
```
105105

106-
Now that the `feature_x` branch has been pushed to your GitHub repository, you can initiate the pull request.
106+
Now that the `feature_x` branch has been pushed to your GitHub repository, you can initiate the pull request.
107107

108108
To initiate the pull request, do the following:
109109

‎debian/cloudstack-cli.install

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

‎debian/cloudstack-docs.install

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

‎services/console-proxy/rdpconsole/rdp-config.bat

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ rem regarding copyright ownership. The ASF licenses this file
55
rem to you under the Apache License, Version 2.0 (the
66
rem "License"); you may not use this file except in compliance
77
rem with the License. You may obtain a copy of the License at
8-
rem
8+
rem
99
rem http://www.apache.org/licenses/LICENSE-2.0
10-
rem
10+
rem
1111
rem Unless required by applicable law or agreed to in writing,
1212
rem software distributed under the License is distributed on an
1313
rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1414
rem KIND, either express or implied. See the License for the
1515
rem specific language governing permissions and limitations
1616
rem under the License.
1717

18-
rem
18+
rem
1919
rem Configure and start RDP service. Run this script on RDP server.
20-
rem
21-
20+
rem
21+
2222
rem Turn off firewall
2323

2424
netsh advfirewall firewall set rule group="Remote Desktop" new enable=yes

‎services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ rem KIND, either express or implied. See the License for the
1515
rem specific language governing permissions and limitations
1616
rem under the License.
1717

18-
rem
18+
rem
1919
rem Configure and start RDP service.
2020
rem Configure RPD service to use custom key instead of autogenerated for Wireshark and Network Monitor Decrypt Expert.
2121
rem rdp.pfx is necessary because it fingerprints are hardcoded in this script.
22-
rem
22+
rem
2323

2424
rem Turn off firewall
2525

2626
netsh advfirewall firewall set rule group="Remote Desktop" new enable=yes
2727

2828
rem Enable TS connections
29-
rem
29+
rem
3030
rem Windows Registry Editor Version 5.00
31-
rem
31+
rem
3232
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]
3333
rem "AllowTSConnections"=dword:00000001
3434
rem "fDenyTSConnections"=dword:00000000
@@ -57,7 +57,7 @@ certutil -p test -importPFX "Remote Desktop" rdp.pfx
5757
rem Configure RDP server to use certificate:
5858

5959
rem Windows Registry Editor Version 5.00
60-
rem
60+
rem
6161
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp]
6262
rem "SSLCertificateSHA1Hash"=hex:c1,70,84,70,bc,56,42,0a,bb,f4,35,35,ba,a6,09,b0,4e,98,4a,47
6363
reg add "HKLM\System\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" /v "SSLCertificateSHA1Hash" /t REG_HEX /d "" /f
@@ -73,13 +73,13 @@ rem certutil -store -v My
7373
certutil -store -v "Remote Desktop"
7474

7575
rem Disable TLS 1.1 (for Network Monitor Decrypt Expert)
76-
rem
76+
rem
7777
rem Windows Registry Editor Version 5.00
78-
rem
78+
rem
7979
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1\Client]
8080
rem "Enabled"=dword:00000000
8181
rem "DisabledByDefault"=dword:00000001
82-
rem
82+
rem
8383
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1\Server]
8484
rem "Enabled"=dword:00000000
8585
rem "DisabledByDefault"=dword:00000001
@@ -91,13 +91,13 @@ reg add "HKLM\System\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protoc
9191

9292

9393
rem Disable TLS 1.2 (for Network Monitor Decrypt Expert)
94-
rem
94+
rem
9595
rem Windows Registry Editor Version 5.00
96-
rem
96+
rem
9797
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Client]
9898
rem "Enabled"=dword:00000000
9999
rem "DisabledByDefault"=dword:00000001
100-
rem
100+
rem
101101
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Server]
102102
rem "Enabled"=dword:00000000
103103
rem "DisabledByDefault"=dword:00000001
@@ -135,4 +135,4 @@ rem dism /online /enable-feature /featurename:NetFx3
135135
rem PS.
136136
rem Don't forget to set Windows profile as active in Network Monitor, so SSL traffic branch will appear under
137137
rem svnchost.exe, so you will be able to decrypt it (don't forget to save and reopen captured traffic to file first).
138-
rem
138+
rem

‎test/scripts/run.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ rem regarding copyright ownership. The ASF licenses this file
55
rem to you under the Apache License, Version 2.0 (the
66
rem "License"); you may not use this file except in compliance
77
rem with the License. You may obtain a copy of the License at
8-
rem
8+
rem
99
rem http://www.apache.org/licenses/LICENSE-2.0
10-
rem
10+
rem
1111
rem Unless required by applicable law or agreed to in writing,
1212
rem software distributed under the License is distributed on an
1313
rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

‎tools/apidoc/generatecommand.xsl

+24-24
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ version="1.0">
3636
<div class="uppermenu_box"><!-- #BeginLibraryItem "/libraries/uppermenu.lbi" -->
3737

3838
<div class="uppermenu">
39-
<a href="libraries/learn_download.html">Downloads</a> | <a href="libraries/company_news.html">News</a> | <a href="#">Contact Us</a>
39+
<a href="libraries/learn_download.html">Downloads</a> | <a href="libraries/company_news.html">News</a> | <a href="#">Contact Us</a>
4040
</div><!-- #EndLibraryItem --></div>
4141
</div>
42-
42+
4343
<div id="main_controller">
4444
<div id="inside_header">
4545

4646
<div class="header_top">
4747
<a class="cloud_logo" href="index.html"></a>
4848
<div class="mainemenu_panel">
49-
49+
5050
</div>
5151
</div>
5252
<div class="insideheader_bot">
@@ -62,11 +62,11 @@ version="1.0">
6262
<div class="insheader_buttonshadow"></div>
6363
</div>
6464
</div>
65-
65+
6666
</div>
6767

6868
<div id="main_content">
69-
69+
7070
<div class="inside_apileftpanel">
7171
<div class="inside_contentpanel" style="width:930px;">
7272
<div class="api_titlebox">
@@ -77,12 +77,12 @@ version="1.0">
7777
</xsl:for-each>
7878
</div>
7979

80-
80+
8181
<div class="api_titlebox_right">
8282
<a class="api_backbutton" href="#"></a>
8383
</div>
8484
</div>
85-
<div class="api_tablepanel">
85+
<div class="api_tablepanel">
8686
<h2>Request parameters</h2>
8787
<table class="apitable">
8888
<tr class="hed">
@@ -101,16 +101,16 @@ version="1.0">
101101
</xsl:for-each>
102102
</table>
103103
</div>
104-
105-
106-
<div class="api_tablepanel">
104+
105+
106+
<div class="api_tablepanel">
107107
<h2>Response Tags</h2>
108108
<table class="apitable">
109109
<tr class="hed">
110110
<td style="width:200px;"><strong>Response Name</strong></td>
111111
<td style="width:500px;">Description</td>
112112
</tr>
113-
113+
114114
<xsl:for-each select="command/command/response/arg">
115115
<tr>
116116
<td style="width:200px;"><strong><xsl:value-of select="name"/></strong></td>
@@ -125,24 +125,24 @@ version="1.0">
125125
<td style="width:200px;"><strong><xsl:value-of select="name"/></strong></td>
126126
<td style="width:500px;"><xsl:value-of select="description"/></td>
127127
</tr>
128-
</xsl:for-each>
129-
</xsl:for-each>
128+
</xsl:for-each>
129+
</xsl:for-each>
130130
</tr>
131131
</xsl:for-each>
132-
133-
134-
135-
136-
132+
133+
134+
135+
136+
137137
</table>
138138

139139
</div>
140-
141-
142-
</div>
140+
141+
143142
</div>
144-
145-
143+
</div>
144+
145+
146146
</div>
147147
</div><!-- #BeginLibraryItem "/libraries/footer.lbi" -->
148148
<div id="footer">
@@ -169,7 +169,7 @@ version="1.0">
169169

170170
<li> <a href="#"> Blog</a> </li>
171171
<li> <a href="#"> Contacts</a> </li>
172-
172+
173173
</ul>
174174
<ul class="footer_linksbox">
175175
<li><strong> Site Info </strong> </li>

‎tools/apidoc/generatetoc_footer.xsl

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ KIND, either express or implied. See the License for the
1616
specific language governing permissions and limitations
1717
under the License.
1818
-->
19-
</div>
20-
</div>
19+
</div>
2120
</div>
22-
23-
21+
</div>
22+
23+
2424
</div>
2525
</div>
2626
<div id="footer">

‎tools/apidoc/generatetoc_header.xsl

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ version="1.0">
3535
<div class="uppermenu_panel">
3636
<div class="uppermenu_box"></div>
3737
</div>
38-
38+
3939
<div id="main_controller">
4040
<div id="inside_header">
4141
<div class="header_top">
4242
<a class="cloud_logo" href="http://cloudstack.org"></a>
4343
<div class="mainemenu_panel">
44-
44+
4545
</div>
4646
</div>
47-
48-
47+
48+
4949
</div>
5050
<div id="main_content">
51-
51+
5252
<div class="inside_apileftpanel">
5353
<div class="inside_contentpanel" style="width:930px;">
5454
<h1>Apache CloudStack API Documentation (%ACS_RELEASE%)</h1>
@@ -60,7 +60,7 @@ version="1.0">
6060
<a href="http://docs.cloudstack.apache.org/en/latest/dev.html">Developer's Guide</a>.</p>
6161
</div>
6262
</div>
63-
63+
6464
<div class="api_leftsections">
6565
<h3>%API_HEADER%</h3>
6666
<span>Commands available through the developer API URL and the integration API URL.</span>

‎tools/apidoc/includes/main.css

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* to you under the Apache License, Version 2.0 (the
88
* "License"); you may not use this file except in compliance
99
* with the License. You may obtain a copy of the License at
10-
*
10+
*
1111
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
12+
*
1313
* Unless required by applicable law or agreed to in writing,
1414
* software distributed under the License is distributed on an
1515
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -66,7 +66,7 @@ body{
6666
float:right;
6767
margin:0;
6868
padding:0;
69-
69+
7070
}
7171

7272
.uppermenu {
@@ -89,7 +89,7 @@ body{
8989
text-align:left;
9090
text-decoration:none;
9191
margin:0 5px 0 5px;
92-
92+
9393
}
9494

9595
.uppermenu a:visited {
@@ -100,7 +100,7 @@ body{
100100
text-align:left;
101101
text-decoration:none;
102102
margin:0 5px 0 5px;
103-
103+
104104
}
105105

106106
.uppermenu a:hover {
@@ -111,7 +111,7 @@ body{
111111
text-align:left;
112112
text-decoration:none;
113113
margin:0 5px 0 5px;
114-
114+
115115
}
116116

117117

@@ -346,7 +346,7 @@ a.cloud_logo {
346346
font-size:18px;
347347
margin:10px 0 0 0;
348348
padding:0;
349-
}
349+
}
350350
.main_homecontent_right {
351351
width:311px;
352352
height:auto;

‎tools/ngui/static/css/app.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
Licensed to the Apache Software Foundation (ASF) under one
33
or more contributor license agreements. See the NOTICE file
44
distributed with this work for additional information

0 commit comments

Comments
 (0)