From 61301e78b14ee5478793717622dcc0123994955f Mon Sep 17 00:00:00 2001
From: Leonid Bugaev <leonsbox@gmail.com>
Date: Thu, 2 Aug 2018 21:44:53 +0500
Subject: [PATCH] Fix merge

---
 elasticsearch_test.go | 2 +-
 limiter.go            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/elasticsearch_test.go b/elasticsearch_test.go
index 701c38f..c29724d 100644
--- a/elasticsearch_test.go
+++ b/elasticsearch_test.go
@@ -28,7 +28,7 @@ func assertExpectedError (returnedError error, t *testing.T) {
 
 func assertNoError (returnedError error, t *testing.T) {
 	if nil != returnedError {
-		t.Errorf("Expected err %s but got %s", nil, returnedError)
+		t.Errorf("Expected no error got %s", returnedError)
 	}
 }
 
diff --git a/limiter.go b/limiter.go
index cb1a36c..c28ff62 100644
--- a/limiter.go
+++ b/limiter.go
@@ -96,5 +96,5 @@ func (l *Limiter) Read(data []byte) (n int, err error) {
 }
 
 func (l *Limiter) String() string {
-	return fmt.Sprintf("Limiting %s to: %d (isPercent: %b)", l.plugin, l.limit, l.isPercent)
+	return fmt.Sprintf("Limiting %s to: %d (isPercent: %v)", l.plugin, l.limit, l.isPercent)
 }