Merge pull request #3398 from ddysher/fixes

Doc fixes
pull/6/head
Joe Beda 2015-01-12 10:59:54 -08:00
commit d890707237
2 changed files with 6 additions and 2 deletions

View File

@ -7,7 +7,7 @@ to apiserver. Currently, tokens last indefinitely, and the token list cannot
be changed without restarting apiserver. We plan in the future for tokens to be changed without restarting apiserver. We plan in the future for tokens to
be short-lived, and to be generated as needed rather than stored in a file. be short-lived, and to be generated as needed rather than stored in a file.
The token file format is implemented in `pkg/auth/authenticator/tokenfile/...` The token file format is implemented in `plugin/pkg/auth/authenticator/token/tokenfile/...`
and is a csv file with 3 columns: token, user name, user uid. and is a csv file with 3 columns: token, user name, user uid.
## Plugin Development ## Plugin Development

View File

@ -137,6 +137,10 @@ godep go tool cover -html=target/c.out
## Integration tests ## Integration tests
You need an [etcd](https://github.com/coreos/etcd/releases/tag/v0.4.6) in your path, please make sure it is installed and in your ``$PATH``. You need an [etcd](https://github.com/coreos/etcd/releases/tag/v0.4.6) in your path, please make sure it is installed and in your ``$PATH``.
```
cd kubernetes
hack/test-integration.sh
```
## End-to-End tests ## End-to-End tests