Skip to content

Commit

Permalink
Merge branch 'milestone2' of github.com:SkycoinProject/skywire-mainne…
Browse files Browse the repository at this point in the history
…t into fix/rule-expiration
  • Loading branch information
Darkren committed Feb 20, 2020
2 parents 2ee633f + 2427496 commit 3e54cf4
Show file tree
Hide file tree
Showing 20 changed files with 392 additions and 14 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/SkycoinProject/skywire-mainnet
go 1.13

require (
github.com/SkycoinProject/dmsg v0.0.0-20200218101358-80f8406e37c4
github.com/SkycoinProject/dmsg v0.0.0-20200220122410-79d9d7bac617
github.com/SkycoinProject/skycoin v0.27.0
github.com/SkycoinProject/yamux v0.0.0-20191213015001-a36efeefbf6a
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
Expand All @@ -23,7 +23,7 @@ require (
github.com/spf13/cobra v0.0.5
github.com/stretchr/testify v1.4.0
go.etcd.io/bbolt v1.3.3
golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6
golang.org/x/crypto v0.0.0-20200219234226-1ad67e1f0ef4
golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a
golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c // indirect
)
Expand Down
92 changes: 92 additions & 0 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/app/appserver/proc_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ func (m *procManager) Wait(name string) error {
}

if _, err := m.pop(name); err != nil {
m.log.Debugf("Pop app: %v", err)
m.log.Debugf("Remove app <%v>: %v", name, err)
}

return err
Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/SkycoinProject/dmsg/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions vendor/github.com/SkycoinProject/dmsg/Makefile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/SkycoinProject/dmsg/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/SkycoinProject/dmsg/cipher/cipher.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions vendor/github.com/SkycoinProject/dmsg/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions vendor/github.com/SkycoinProject/dmsg/const.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/github.com/SkycoinProject/dmsg/entity_common.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion vendor/github.com/SkycoinProject/dmsg/go.mod

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3e54cf4

Please sign in to comment.