Skip to content

Commit

Permalink
Merge pull request #1093 from maticnetwork/arpit/1.2.0
Browse files Browse the repository at this point in the history
merge master into develop
  • Loading branch information
temaniarpit27 committed Nov 22, 2023
2 parents 923c192 + 47bffe9 commit 11969b0
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 11 deletions.
10 changes: 9 additions & 1 deletion builder/files/genesis-mainnet-v1.json

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions internal/cli/server/chains/mainnet.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: bor
Version: 1.1.0-beta4
Version: 1.2.0-beta
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>
Expand Down
2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control.arm64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: bor
Version: 1.1.0-beta4
Version: 1.2.0-beta
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>
Expand Down
2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control.profile.amd64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: bor-profile
Version: 1.1.0-beta4
Version: 1.2.0-beta
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>
Expand Down
2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control.profile.arm64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: bor-profile
Version: 1.1.0-beta4
Version: 1.2.0-beta
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>
Expand Down
2 changes: 1 addition & 1 deletion packaging/templates/package_scripts/control.validator
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: bor-profile
Version: 1.1.0-beta4
Version: 1.2.0-beta
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: bor-profile
Version: 1.1.0-beta4
Version: 1.2.0-beta
Section: develop
Priority: standard
Maintainer: Polygon <release-team@polygon.technology>
Expand Down
8 changes: 8 additions & 0 deletions params/config.go

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions params/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
)

const (
VersionMajor = 1 // Major version component of the current release
VersionMinor = 1 // Minor version component of the current release
VersionPatch = 0 // Patch version component of the current release
VersionMeta = "beta4" // Version metadata to append to the version string
VersionMajor = 1 // Major version component of the current release
VersionMinor = 2 // Minor version component of the current release
VersionPatch = 0 // Patch version component of the current release
VersionMeta = "beta" // Version metadata to append to the version string
)

var GitCommit string
Expand Down

0 comments on commit 11969b0

Please sign in to comment.