Merge branch '1.4'

weaveworks · Mar 22, 2016 · b080224 · b080224
2 parents 63a9f87 + 5378680
commit b080224
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/nameserver/entry.go b/nameserver/entry.go
@@ -109,9 +109,9 @@ func (e1 *Entry) addLowercase() {
 	e1.lHostname = strings.ToLower(e1.Hostname)
 }
 
-func (e *Entry) tombstone() {
-	e.Version++
-	e.Tombstone = now()
+func (e1 *Entry) tombstone() {
+	e1.Version++
+	e1.Tombstone = now()
 }
 
 func check(es SortableEntries) error {
@@ -220,9 +220,8 @@ func (es Entries) findEqual(e *Entry) (*Entry, bool) {
 	})
 	if i < len(es) && es[i].equal(*e) {
 		return &es[i], true
-	} else {
-		return nil, false
 	}
+	return nil, false
 }
 
 func (es Entries) lookup(hostname string) Entries {