Skip to content

Commit

Permalink
Merge pull request #696 from owncloud/expected-failures-diffs
Browse files Browse the repository at this point in the history
[tests-only] Adjust expected-failures files to be similar
  • Loading branch information
phil-davis authored Oct 14, 2020
2 parents 7fbe511 + 1061783 commit fe69d5d
Show file tree
Hide file tree
Showing 4 changed files with 222 additions and 91 deletions.
2 changes: 1 addition & 1 deletion ocis/pkg/runtime/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ type Options struct {
Context *cli.Context
}

// Option undocummented
// Option undocumented
type Option func(o *Options)

// Services option
Expand Down
2 changes: 1 addition & 1 deletion ocis/templates/CONFIGURATION.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ For this configuration to be picked up, have a look at your extension `root` com

So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`.

### Envrionment variables
### Environment variables

If you prefer to configure the service with environment variables you can see the available variables below.

Expand Down
Loading

0 comments on commit fe69d5d

Please sign in to comment.