Skip to content

Commit

Permalink
fixed bad indentation due to broken go-yaml package commit
Browse files Browse the repository at this point in the history
  • Loading branch information
mskarbe committed Jul 2, 2020
1 parent 998a71c commit 6e0189c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Origin (DCO). This document was created by the Linux Kernel community and is a
simple statement that you, as a contributor, have the legal right to make the
contribution. See the [DCO](DCO) file for details.

Any copyright notices in this repo should specify the authors as "the Kubermatic Aquayman project contributors".
Any copyright notices in this repo should specify the authors as "the Kubermatic Gman project contributors".

To sign your work, just add a line like this at the end of your commit message:

Expand All @@ -26,7 +26,7 @@ By doing this you state that you can certify the following (from https://develop

## Email and Chat

The Aquayman project currently uses the general Kubermatic email list and Slack channel:
The Gman project currently uses the general Kubermatic email list and Slack channel:
- Email: [Kubermatic-dev](https://groups.google.com/forum/#!forum/kubermatic-dev)
- Slack: #[Slack](http://slack.kubermatic.io/) on Slack

Expand Down
22 changes: 11 additions & 11 deletions config.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ organization: myorganization
# The list of org units in this organization. Org units not defined
# here will be deleted during synchronization.
org_units:
- name: ExampleUnit
description: test org unit
parentOrgUnitPath: / # single slash indicates the parent org
org_unit_path: /ExampleUnit # single slash followed by the name of the OU
- name: ExampleUnit
description: test org unit
parentOrgUnitPath: / # single slash indicates the parent org
org_unit_path: /ExampleUnit # single slash followed by the name of the OU

# The list of users in this organization. Users not defined
# here will be deleted during synchronization.
Expand All @@ -33,10 +33,10 @@ users:
# Groups not defined here will be deleted during synchronization.
# Members not defined in the group will be removed from it during synchronization.
groups:
- name: Test Group
email: testgroup@myorganization.com
members:
- email: horst@myorganization.com
role: MEMBER # role can be MEMBER, OWNER or MANAGER
- email: gregor@myorganization.com
role: OWNER
- name: Test Group
email: testgroup@myorganization.com
members:
- email: horst@myorganization.com
role: MEMBER # role can be MEMBER, OWNER or MANAGER
- email: gregor@myorganization.com
role: OWNER
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ require (
github.com/urfave/cli/v2 v2.2.0
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
google.golang.org/api v0.26.0
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
)
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo=
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
Expand Down

0 comments on commit 6e0189c

Please sign in to comment.