scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 10:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:umbel/pilosa

Browse source
This commit is contained in:
Todd Gruben 2016-04-26 14:41:48 -05:00
commit 616248707b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Godeps/Godeps.json generated
View file

@ -1,6 +1,6 @@
{
"ImportPath": "github.com/umbel/pilosa",
"GoVersion": "go1.5.1",
"GoVersion": "go1.6.2",
"Packages": [
"./..."
],
@ -21,8 +21,8 @@
},
{
"ImportPath": "github.com/gogo/protobuf/proto",
"Comment": "v0.2-9-g4365f75",
"Rev": "4365f750fe246471f2a03ef5da5231c3565c5628"
"Comment": "v0.2-10-g74b6e9d",
"Rev": "74b6e9deaff6ba6da1389ec97351d337f0d08b06"
},
{
"ImportPath": "github.com/golang/groupcache/lru",

8
Makefile
View file

@ -1,5 +1,7 @@
.PHONY: vendor
default:
# Temporary workaround to avoid testing vendor directory.
test:
go test $(go list ./... | grep -v /vendor/)
vendor:
godep save ./...
cp -r $(GOPATH)/src/github.com/gogo/protobuf/proto/testdata vendor/github.com/gogo/protobuf/proto/testdata