TrueCloudLab/frostfs-s3-gw
17
3
Fork 19
Code Issues 28 Pull requests 7 Projects Releases 17 Packages Activity Actions

Fix merge conflicts

Browse source
This commit is contained in:
Evgeniy Kulikov 2020-07-07 14:28:49 +03:00
parent 2ccc778fca
commit cba8cbd13c
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app-settings.go
View file

@ -158,15 +158,9 @@ func newSettings() *viper.Viper {
peers := flags.StringArrayP("peers", "p", nil, "NeoFS nodes") peers := flags.StringArrayP("peers", "p", nil, "NeoFS nodes")
// set prefers: // set prefers:
<<<<<<< Updated upstream v.Set(cfgApplicationName, misc.ApplicationName)
v.Set("app.name", misc.ApplicationName)
v.Set("app.version", misc.Version)
v.Set("app.build_time", misc.Build)
=======
v.Set(cfgApplicationName, "neofs-gw")
v.Set(cfgApplicationVersion, misc.Version) v.Set(cfgApplicationVersion, misc.Version)
v.Set(cfgApplicationBuildTime, misc.Build) v.Set(cfgApplicationBuildTime, misc.Build)
>>>>>>> Stashed changes
// set defaults: // set defaults: