Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xActiveDirectory: Adding a Branches section to the README.md #193

Merged
merged 2 commits into from
May 24, 2018
Merged

xActiveDirectory: Adding a Branches section to the README.md #193

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a5580e
Changes to xActiveDirectory
johlju May 21, 2018
19b1dae
Fix typo
johlju May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,33 @@
# xActiveDirectory

[![Build status](https://ci.appveyor.com/api/projects/status/p4jejr60jrgb8ity/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xactivedirectory/branch/master)
[![codecov](https://codecov.io/gh/PowerShell/xActiveDirectory/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/xActiveDirectory)

The **xActiveDirectory** DSC resources allow you to configure and manage Active Directory.
Note: these resources do not presently install the RSAT tools.
The **xActiveDirectory** DSC resources allow you to configure and manage Active
Directory.
Note: these resources do not presently install the Remote Server Administration
Tools (RSAT).

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

## Branches

### master

[![Build status](https://ci.appveyor.com/api/projects/status/p4jejr60jrgb8ity/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xActiveDirectory/branch/master)
[![codecov](https://codecov.io/gh/PowerShell/xActiveDirectory/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/xActiveDirectory/branch/master)

This is the branch containing the latest release -
no contributions should be made directly to this branch.

### dev

[![Build status](https://ci.appveyor.com/api/projects/status/p4jejr60jrgb8ity/branch/dev?svg=true)](https://ci.appveyor.com/project/PowerShell/xActiveDirectory/branch/dev)
[![codecov](https://codecov.io/gh/PowerShell/xActiveDirectory/branch/dev/graph/badge.svg)](https://codecov.io/gh/PowerShell/xActiveDirectory/branch/dev)

This is the development branch
to which contributions should be proposed by contributors as pull requests.
This development branch will periodically be merged to the master branch,
and be released to [PowerShell Gallery](https://www.powershellgallery.com/).

## Contributing

Please check out common DSC Resource [contributing guidelines](https://github.com/PowerShell/DscResources/blob/master/CONTRIBUTING.md).
Expand Down Expand Up @@ -291,6 +310,8 @@ The xADServicePrincipalName DSC resource will manage service principal names.
* Changes to xActiveDirectory
* The resources are now in alphabetical order in the README.md
([issue #194](https://github.com/PowerShell/xActiveDirectory/issues/194)).
* Adding a Branches section to the README.md with Codecov badges for both
master and dev branch ([issue #192](https://github.com/PowerShell/xActiveDirectory/issues/192)).

### 2.18.0.0

Expand Down