scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-07 09:05:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

corrected some merge issues

Browse source
This commit is contained in:
Todd Gruben 2017-08-08 12:06:06 -05:00
parent 728308a5bb
commit dfbfc217d9
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fragment_test.go
View file

@ -940,7 +940,7 @@ func TestFragment_Zero_Tanimoto(t *testing.T) {
}
func TestFragment_Snapshot_Run(t *testing.T) {
f := MustOpenFragment("i", "f", pilosa.ViewStandard, 0, "")
f := test.MustOpenFragment("i", "f", pilosa.ViewStandard, 0, "")
defer f.Close()
// Set bits on the fragment.

2
server.go
View file

@ -165,7 +165,7 @@ func (s *Server) Open() error {
go func() {
err := http.Serve(ln, s.Handler)
if err != nil {
s.logger().Printf("HTTP handler terminated with error: %s\n", err)
s.Logger().Printf("HTTP handler terminated with error: %s\n", err)
}
}()