Merging from master

Upstream-commit: be49f0a1182164d0d279484ec35931c1e3ef6d3c Component: engine
2013-07-05 12:27:10 -07:00
parent 057f0a4b6f 00b3b197f8
commit bf4fc24d05
47 changed files with 1030 additions and 649 deletions
--- a/components/engine/auth/auth_test.go
+++ b/components/engine/auth/auth_test.go
@ -68,6 +68,6 @@ func TestCreateAccount(t *testing.T) {
 	expectedError := "Login: Account is not Active"

 	if !strings.Contains(err.Error(), expectedError) {
-		t.Fatalf("Expected message \"%s\" but found \"%s\" instead", expectedError, err.Error())
+		t.Fatalf("Expected message \"%s\" but found \"%s\" instead", expectedError, err)
 	}
 }