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

fix flare archive #1171

Merged
merged 19 commits into from
Feb 6, 2018
Merged

fix flare archive #1171

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3f112b7
add new dep
ofek Feb 2, 2018
123029c
rename
ofek Feb 2, 2018
6b4e5db
begin
ofek Feb 2, 2018
8759274
fix zip
ofek Feb 2, 2018
101cd1c
this too
ofek Feb 2, 2018
dbf783f
fix
ofek Feb 2, 2018
27def11
fix
ofek Feb 2, 2018
ca28500
update Gopkg.lock
ofek Feb 2, 2018
dc49c2a
try
ofek Feb 2, 2018
674d3d0
fix
ofek Feb 2, 2018
4032c06
fix
ofek Feb 2, 2018
700dfc4
add override
ofek Feb 3, 2018
987a817
remove magic
ofek Feb 3, 2018
061a0e3
Merge branch 'master' into ofek/fix-flare-archive
ofek Feb 5, 2018
f2eddc7
use hex
ofek Feb 5, 2018
6216f22
Merge branch 'master' into ofek/fix-flare-archive
ofek Feb 6, 2018
f52be37
fix
ofek Feb 6, 2018
10486c1
add reno
ofek Feb 6, 2018
15f95aa
typo
ofek Feb 6, 2018
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
233 changes: 148 additions & 85 deletions Gopkg.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@
name = "github.com/gorilla/mux"
version = "1.1.0"

[[constraint]]
name = "github.com/mholt/archiver"
revision = "26cf5bb32d07aa4e8d0de15f56ce516f4641d7df"

[[constraint]]
name = "github.com/jhoonb/archivex"
revision = "be4efa7ec0c38ab76d56037014c90d48d6b13037"
Expand Down Expand Up @@ -83,6 +87,10 @@
name = "github.com/stretchr/testify"
version = "1.1.3"

[[override]]
name = "github.com/ugorji/go"
revision = "8c0409fcbb70099c748d71f714529204975f6c3f"

[[constraint]]
name = "gopkg.in/yaml.v2"

Expand Down
1 change: 1 addition & 0 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ core,github.com/jquery/jquery,MIT
core,github.com/k-sone/snmpgo,MIT
core,github.com/kardianos/osext,BSD-3-Clause
core,github.com/magiconair/properties,BSD-2-Clause
core,github.com/mholt/archiver,MIT
core,github.com/Microsoft/go-winio,MIT
core,github.com/mitchellh/mapstructure,MIT
core,github.com/mitchellh/reflectwalk,MIT
Expand Down
Loading