Skip to content

Commit b1f1816

Browse files
jbamptonjbampton
authored
Merge branch 'main' into fix-spelling-grammar-case-whitespace
2 parents c76a7f4 + ac3b180 commit b1f1816

File tree

303 files changed

+1725
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+1725
-327
lines changed

‎.github/workflows/license-templates/LICENSE.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Licensed to the Apache Software Foundation (ASF) under one
2+
or more contributor license agreements. See the NOTICE file
3+
distributed with this work for additional information
4+
regarding copyright ownership. The ASF licenses this file
5+
to you under the Apache License, Version 2.0 (the
6+
"License"); you may not use this file except in compliance
7+
with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing,
12+
software distributed under the License is distributed on an
13+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
KIND, either express or implied. See the License for the
15+
specific language governing permissions and limitations
16+
under the License.

‎.github/workflows/linter.yml‎ renamed to ‎.github/workflows/pre-commit.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,6 @@ jobs:
4444
path: ~/.cache/pre-commit
4545
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
4646
- name: Run pre-commit
47-
run: pre-commit run --all-files
47+
run: pre-commit run --color=always --all-files
48+
- name: Run manual pre-commit hooks
49+
run: pre-commit run --color=always --all-files --hook-stage manual

‎.pre-commit-config.yaml‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,43 @@ repos:
2525
hooks:
2626
- id: identity
2727
- id: check-hooks-apply
28+
- repo: https://github.com/thlorenz/doctoc.git
29+
rev: v2.2.0
30+
hooks:
31+
- id: doctoc
32+
name: Add TOC for Markdown files
33+
files: ^CONTRIBUTING\.md$|^INSTALL\.md$|^README\.md$
34+
- repo: https://github.com/oxipng/oxipng
35+
rev: v9.1.5
36+
hooks:
37+
- id: oxipng
38+
name: run oxipng
39+
description: optimize PNG images with lossless compression
40+
args: ['-o', '4', '--strip', 'safe', '--alpha']
2841
- repo: https://github.com/gitleaks/gitleaks
2942
rev: v8.27.2
3043
hooks:
3144
- id: gitleaks
3245
name: run gitleaks
3346
description: detect hardcoded secrets
47+
- repo: https://github.com/Lucas-C/pre-commit-hooks
48+
rev: v1.5.5
49+
hooks:
50+
- id: chmod
51+
name: set file permissions
52+
args: ['644']
53+
files: \.md$
54+
stages: [manual]
55+
- id: insert-license
56+
name: add license for all Markdown files
57+
files: \.md$
58+
args:
59+
- --comment-style
60+
- '<!--|| -->'
61+
- --license-filepath
62+
- .github/workflows/license-templates/LICENSE.txt
63+
- --fuzzy-match-generates-todo
64+
exclude: ^(CHANGES|ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE)\.md$|^ui/docs/(full|smoke)-test-plan\.template\.md$
3465
- repo: https://github.com/pre-commit/pre-commit-hooks
3566
rev: v6.0.0
3667
hooks:
@@ -64,7 +95,7 @@ repos:
6495
^systemvm/agent/certs/realhostip\.key$|
6596
^test/integration/smoke/test_ssl_offloading\.py$
6697
- id: end-of-file-fixer
67-
exclude: \.vhd$
98+
exclude: \.vhd$|\.svg$
6899
- id: file-contents-sorter
69100
args: [--unique]
70101
files: ^\.github/linters/codespell\.txt$

‎CONTRIBUTING.md‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,44 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
120
# Contributing to Apache CloudStack (ACS)
221

322
## Summary
423

24+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
25+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
26+
27+
- [Summary](#summary)
28+
- [Bug fixes](#bug-fixes)
29+
- [Developing new features](#developing-new-features)
30+
- [PendingReleaseNotes file](#pendingreleasenotes-file)
31+
- [Fork the code](#fork-the-code)
32+
- [Making changes](#making-changes)
33+
- [Rebase `feature_x` to include updates from `upstream/main`](#rebase-feature_x-to-include-updates-from-upstreammain)
34+
- [Make a GitHub Pull Request to contribute your changes](#make-a-github-pull-request-to-contribute-your-changes)
35+
- [Cleaning up after a successful pull request](#cleaning-up-after-a-successful-pull-request)
36+
- [Release Principles](#release-principles)
37+
38+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
39+
40+
## Summary
41+
542
This document covers how to contribute to the ACS project. ACS uses GitHub PRs to manage code contributions.
643
These instructions assume you have a GitHub.com account, so if you don't have one you will have to create one. Your proposed code changes will be published to your own fork of the ACS project, and you will submit a Pull Request for your changes to be added.
744

‎INSTALL.md‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
120
# Apache CloudStack Installation basics
221

322
This document describes how to develop, build, package and install Apache
@@ -7,9 +26,21 @@ or the developer [wiki](https://cwiki.apache.org/confluence/display/CLOUDSTACK/H
726
Apache CloudStack developers use various platforms for development, this guide
827
was tested against a CentOS 7 x86_64 setup.
928

10-
* [Setting up development environment](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+CloudStack+Development+Environment) for Apache CloudStack.
11-
* [Building](https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack) Apache CloudStack.
12-
* [Appliance based development](https://github.com/rhtyd/monkeybox)
29+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
30+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
31+
32+
- [Setting up Development Environment](#setting-up-development-environment)
33+
- [Using jenv and/or pyenv for Version Management](#using-jenv-andor-pyenv-for-version-management)
34+
- [Getting the Source Code](#getting-the-source-code)
35+
- [Building](#building)
36+
- [To bring up CloudStack UI](#to-bring-up-cloudstack-ui)
37+
- [Building with non-redistributable plugins](#building-with-non-redistributable-plugins)
38+
- [Packaging and Installation](#packaging-and-installation)
39+
- [Debian/Ubuntu](#debianubuntu)
40+
- [RHEL/CentOS](#rhelcentos)
41+
- [Notes](#notes)
42+
43+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
1344

1445
## Setting up Development Environment
1546

‎PRE-COMMIT.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
120
# pre-commit
221

322
We run [pre-commit](https://pre-commit.com/) with

‎README.md‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
120
# Apache CloudStack
221

322
[![Build Status](https://github.com/apache/cloudstack/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/apache/cloudstack/actions/workflows/build.yml)
@@ -12,6 +31,24 @@
1231

1332
[![Apache CloudStack](tools/logo/apache_cloudstack.png)](https://cloudstack.apache.org/)
1433

34+
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
35+
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
36+
37+
- [Who Uses CloudStack?](#who-uses-cloudstack)
38+
- [Demo](#demo)
39+
- [Getting Started](#getting-started)
40+
- [Getting Source Repository](#getting-source-repository)
41+
- [Documentation](#documentation)
42+
- [News and Events](#news-and-events)
43+
- [Getting Involved and Contributing](#getting-involved-and-contributing)
44+
- [Reporting Security Vulnerabilities](#reporting-security-vulnerabilities)
45+
- [License](#license)
46+
- [Notice of Cryptographic Software](#notice-of-cryptographic-software)
47+
- [Star History](#star-history)
48+
- [Contributors](#contributors)
49+
50+
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
51+
1552
Apache CloudStack is open source software designed to deploy and manage large
1653
networks of virtual machines, as a highly available, highly scalable
1754
Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used

‎agent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
27-
<version>4.22.0.0-SNAPSHOT</version>
27+
<version>4.23.0.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
3030
<dependency>

‎api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
27-
<version>4.22.0.0-SNAPSHOT</version>
27+
<version>4.23.0.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
3030
<dependency>

0 commit comments

Comments
 (0)