From dfbfc217d9ead6c04d0222a7ff4d0b1aea482eaa Mon Sep 17 00:00:00 2001 From: Todd Gruben Date: Tue, 8 Aug 2017 12:06:06 -0500 Subject: [PATCH] corrected some merge issues --- fragment_test.go | 2 +- server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fragment_test.go b/fragment_test.go index 8e0a6c749..702eec70a 100644 --- a/fragment_test.go +++ b/fragment_test.go @@ -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. diff --git a/server.go b/server.go index 419c496e0..97883fae4 100644 --- a/server.go +++ b/server.go @@ -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) } }()