Skip to content

Commit

Permalink
Merge branch 'release/1.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
deviantony committed Jul 26, 2019
2 parents ead887f + 2ef25f4 commit 1c7546d
Show file tree
Hide file tree
Showing 660 changed files with 100,147 additions and 18,859 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*
!dist
!build
!static
152 changes: 110 additions & 42 deletions Gopkg.lock

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

24 changes: 16 additions & 8 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@

[[constraint]]
name = "github.com/Microsoft/go-winio"
version = "0.4.11"
version = "=0.4.11"

[[constraint]]
name = "github.com/asaskevich/govalidator"
version = "9.0.0"
version = "=v9"

# Unable to pin this package to a specific version as repository versions
# are not valid semver: https://github.com/moby/moby/issues/37281
Expand All @@ -52,31 +52,39 @@

[[constraint]]
name = "github.com/gorilla/mux"
version = "1.6.2"
version = "=1.6.2"

[[constraint]]
name = "github.com/gorilla/websocket"
version = "1.4.0"
version = "=1.4.0"

[[constraint]]
name = "github.com/hashicorp/logutils"
version = "1.0.0"
version = "=1.0.0"

[[constraint]]
name = "github.com/hashicorp/serf"
version = "0.8.1"
version = "=0.8.3"

[[constraint]]
name = "github.com/jaypipes/ghw"
version = "0.2"
version = "=0.2"

[[constraint]]
branch = "master"
name = "github.com/koding/websocketproxy"

[[constraint]]
name = "github.com/portainer/libhttp"
version = "1.0.1"
version = "=1.0.1"

[[constraint]]
name = "github.com/portainer/libcrypto"
version = "=1.0.0"

[[constraint]]
name = "github.com/jpillora/chisel"
version = "=1.3.1"

[prune]
go-tests = true
Expand Down
17 changes: 17 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Copyright (c) 2019 Portainer.io

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Loading

0 comments on commit 1c7546d

Please sign in to comment.