Merge branch 'master' into dmuts

query/query.go

@@ -171,7 +171,7 @@ func postTraverse(g *SubGraph) (result map[uint64]interface{}, rerr error) {
 	r.Init(g.result, ro)
 
 	if q.UidsLength() != r.UidmatrixLength() {
-		glog.Fatal("Result uidmatrixlength: %v. Query uidslength: %v",
+		glog.Fatalf("Result uidmatrixlength: %v. Query uidslength: %v",
 			r.UidmatrixLength(), q.UidsLength())
 	}
 	if q.UidsLength() != r.ValuesLength() {

query/query_test.go

@@ -81,7 +81,7 @@ func checkSingleValue(t *testing.T, child *SubGraph,
 	}
 
 	if ul.UidsLength() != 0 {
-		t.Error("Expected uids length 0. Got: %v", ul.UidsLength())
+		t.Errorf("Expected uids length 0. Got: %v", ul.UidsLength())
 	}
 	checkName(t, r, 0, value)
 }