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

Jump to bottom

chore: dependabot version upgrade nats metrics oss #4453

Merged
merged 42 commits into from
Dec 27, 2023
Merged

chore: dependabot version upgrade nats metrics oss #4453

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
57f9b7f
version upgraded
ShashwatDadhich Nov 28, 2023
4b3016f
vendor file argoproj added
ShashwatDadhich Nov 29, 2023
3683376
grpc version upgraded
adi6859 Nov 29, 2023
8175e3a
net ,elazarl version upgraded
adi6859 Nov 29, 2023
5ed1a8a
net ,elazarl version upgraded
adi6859 Nov 29, 2023
032f6e1
version upgraded
adi6859 Nov 29, 2023
e0838eb
version upgraded
adi6859 Nov 29, 2023
1fd3a5f
go sum committed
adi6859 Nov 30, 2023
effa4e6
version upgrade
ShashwatDadhich Dec 1, 2023
341f645
dependency upgrade
ShashwatDadhich Dec 1, 2023
407e149
version upgraded for open-telemetry
adi6859 Dec 1, 2023
8528fb7
version upgraded for swift-nio-http2
adi6859 Dec 1, 2023
8d8122d
Merge branch 'main' into otelgrpc-upgrade
adi6859 Dec 1, 2023
3b8ad0c
Merge branch 'otelgrpc-upgrade' into orch-version-up
adi6859 Dec 4, 2023
8dea48f
merged upgrade in feature branch
adi6859 Dec 4, 2023
67f670a
wire gen
adi6859 Dec 4, 2023
6f4ca45
merged orch-version-up
ShashwatDadhich Dec 4, 2023
ebdc17d
Merge branch 'main' into dependabot_version_upgrade
adi6859 Dec 4, 2023
4ab8404
Merge remote-tracking branch 'refs/remotes/origin/dependabot_version_…
adi6859 Dec 4, 2023
0e4bfca
merged dependabot_telemetry
ShashwatDadhich Dec 4, 2023
fc6546f
merged dependabot_telemetry
ShashwatDadhich Dec 4, 2023
3727e81
SecureJoin version upgraded
ShashwatDadhich Dec 4, 2023
9ea4d63
argo-cd assets reverted
ShashwatDadhich Dec 4, 2023
cfc99eb
merge common lib
adi6859 Dec 5, 2023
b3a60a3
main merge
adi6859 Dec 5, 2023
79d5456
Merge branch 'main' into dependabot_version_upgrade
adi6859 Dec 11, 2023
48e3a6b
importing authenticator
adi6859 Dec 11, 2023
a661821
importing common-lib
adi6859 Dec 11, 2023
d665070
importing authenticator
adi6859 Dec 11, 2023
6022c25
main merge
adi6859 Dec 12, 2023
36e5b34
fix
ShashwatDadhich Dec 12, 2023
6f59e61
version upgrade 2.0
adi6859 Dec 12, 2023
4b4435e
version upgrade 3.0
adi6859 Dec 12, 2023
d798f89
version upgrade 4.0
adi6859 Dec 12, 2023
ac89293
Merge branch 'main' into dependabot_version_upgrade
adi6859 Dec 14, 2023
8643ac0
Merge branch 'main' into dependabot_version_upgrade
adi6859 Dec 15, 2023
b94b328
authenticator reverted
adi6859 Dec 18, 2023
de12155
Merge branch 'main' into dependabot_version_upgrade
adi6859 Dec 19, 2023
a45ffda
main merge
adi6859 Dec 22, 2023
c4aecb5
bump common-lib
gireesh-naidu Dec 22, 2023
7536293
bump common-lib
gireesh-naidu Dec 26, 2023
cb17fd2
Merge branch 'main' into dependabot_version_upgrade_nats-metrics-oss
gireesh-naidu Dec 27, 2023
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
Prev Previous commit
Next Next commit
main merge
  • Loading branch information
@adi6859
adi6859 committed Dec 22, 2023
commit a45ffda049597dd421d07d1dc563cc3192cd337e
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/davecgh/go-spew v1.1.1
github.com/deckarep/golang-set v1.8.0
github.com/devtron-labs/authenticator v0.4.32
github.com/devtron-labs/common-lib v0.0.8-0.20231212133823-7cb242d0ce33
github.com/devtron-labs/common-lib v0.0.8
github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2
github.com/evanphx/json-patch v5.6.0+incompatible
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
Expand Down
6 changes: 3 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4 h1:YcpmyvADG
github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
github.com/devtron-labs/authenticator v0.4.32 h1:JAIJ0WqTXWj2nW7b8so9wunNICQn7O1Qpkk8INpatcs=
github.com/devtron-labs/authenticator v0.4.32/go.mod h1:ozNfT8WcruiSgnUbyp48WVfc41++W6xYXhKFp67lNTU=
github.com/devtron-labs/common-lib v0.0.8-0.20231212133823-7cb242d0ce33 h1:aRh0tevvwcaSDZTb87/P22EM8QgoK0VBg7B6867+IV8=
github.com/devtron-labs/common-lib v0.0.8-0.20231212133823-7cb242d0ce33/go.mod h1:edJWNElcpweb5DSUB8zkGwGnXTqz/nKcsbkRylrvqwk=
github.com/devtron-labs/common-lib v0.0.8 h1:rK8uGwNLrsbgzAzXot2JR+oKceb8vLRNsei4MySXDUI=
github.com/devtron-labs/common-lib v0.0.8/go.mod h1:x6OdUIo2z9kxXtBfz7fJEfD4s8kiAtEmlApozOf7ECM=
github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2 h1:/IEIsJTxDZ3hv8uOoCaqdWCXqcv7nCAgX9AP/v84dUY=
github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2/go.mod h1:l85jxWHlcSo910hdUfRycL40yGzC6glE93V1sVxVPto=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
Expand Down Expand Up @@ -757,7 +757,7 @@ github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL
github.com/nats-io/jwt/v2 v2.2.1-0.20220330180145-442af02fd36a h1:lem6QCvxR0Y28gth9P+wV2K/zYUUAkJ+55U8cpS0p5I=
github.com/nats-io/jwt/v2 v2.2.1-0.20220330180145-442af02fd36a/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k=
github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
github.com/nats-io/nats-server/v2 v2.9.23 h1:6Wj6H6QpP9FMlpCyWUaNu2yeZ/qGj+mdRkZ1wbikExU=
github.com/nats-io/nats-server/v2 v2.8.4 h1:0jQzze1T9mECg8YZEl8+WYUXb9JKluJfCBriPUtluB4=
github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
github.com/nats-io/nats.go v1.28.0 h1:Th4G6zdsz2d0OqXdfzKLClo6bOfoI/b1kInhRtFIy5c=
github.com/nats-io/nats.go v1.28.0/go.mod h1:XpbWUlOElGwTYbMR7imivs7jJj9GtK7ypv321Wp6pjc=
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ github.com/devtron-labs/authenticator/jwt
github.com/devtron-labs/authenticator/middleware
github.com/devtron-labs/authenticator/oidc
github.com/devtron-labs/authenticator/password
# github.com/devtron-labs/common-lib v0.0.8-0.20231212133823-7cb242d0ce33
# github.com/devtron-labs/common-lib v0.0.8
## explicit; go 1.20
github.com/devtron-labs/common-lib/blob-storage
github.com/devtron-labs/common-lib/pubsub-lib
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.