Merge branch 'master' into promtail_glob_path
Branches promtail_glob_path
No related tags found
Showing
- Gopkg.lock 177 additions, 154 deletionsGopkg.lock
- Gopkg.toml 20 additions, 12 deletionsGopkg.toml
- cmd/promtail/promtail-docker-config.yaml 1 addition, 1 deletioncmd/promtail/promtail-docker-config.yaml
- cmd/promtail/promtail-local-config.yaml 1 addition, 1 deletioncmd/promtail/promtail-local-config.yaml
- pkg/loki/loki.go 1 addition, 0 deletionspkg/loki/loki.go
- pkg/promtail/config.go 2 additions, 2 deletionspkg/promtail/config.go
- pkg/promtail/target.go 8 additions, 0 deletionspkg/promtail/target.go
- pkg/promtail/targetmanager.go 2 additions, 2 deletionspkg/promtail/targetmanager.go
- production/README.md 4 additions, 2 deletionsproduction/README.md
- production/helm/values.yaml 5 additions, 2 deletionsproduction/helm/values.yaml
- production/ksonnet/README.md 5 additions, 1 deletionproduction/ksonnet/README.md
- production/ksonnet/promtail/promtail.libsonnet 2 additions, 1 deletionproduction/ksonnet/promtail/promtail.libsonnet
- tools/promtail.sh 6 additions, 4 deletionstools/promtail.sh
- vendor/cloud.google.com/go/bigtable/admin.go 305 additions, 55 deletionsvendor/cloud.google.com/go/bigtable/admin.go
- vendor/cloud.google.com/go/bigtable/bigtable.go 56 additions, 29 deletionsvendor/cloud.google.com/go/bigtable/bigtable.go
- vendor/cloud.google.com/go/bigtable/bttest/inmem.go 165 additions, 84 deletionsvendor/cloud.google.com/go/bigtable/bttest/inmem.go
- vendor/cloud.google.com/go/bigtable/doc.go 2 additions, 2 deletionsvendor/cloud.google.com/go/bigtable/doc.go
- vendor/cloud.google.com/go/bigtable/filter.go 15 additions, 2 deletionsvendor/cloud.google.com/go/bigtable/filter.go
- vendor/cloud.google.com/go/bigtable/gc.go 11 additions, 2 deletionsvendor/cloud.google.com/go/bigtable/gc.go
- vendor/cloud.google.com/go/bigtable/internal/gax/call_option.go 9 additions, 5 deletions.../cloud.google.com/go/bigtable/internal/gax/call_option.go
Loading
Please register or sign in to comment