Merge pull request kubernetes#246 from satnam6502/master

Fix a minor typo in the README.md file.
vishh · Sep 22, 2014 · 7663955 · 7663955
2 parents 195772a + 87768a0
commit 7663955
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -134,4 +134,4 @@ cAdvisor aims to improve the resource usage and performance characteristics of r
 
 ## Community
 
-Contributions, questions, and comments are all welcomed and encouraged! cAdvisor developers hand out in [#google-containers](http://webchat.freenode.net/?channels=google-containers) room on freenode.net.  We also have the [google-containers Google Groups mailing list](https://groups.google.com/forum/#!forum/google-containers).
+Contributions, questions, and comments are all welcomed and encouraged! cAdvisor developers hang out in [#google-containers](http://webchat.freenode.net/?channels=google-containers) room on freenode.net.  We also have the [google-containers Google Groups mailing list](https://groups.google.com/forum/#!forum/google-containers).
diff --git a/api/handler.go b/api/handler.go
@@ -172,8 +172,7 @@ func getContainerInfoRequest(body io.ReadCloser) (*info.ContainerInfoRequest, er
 	query.NumStats = 64
 
 	decoder := json.NewDecoder(body)
-	err := decoder.Decode(&query)
-	if err != nil && err != io.EOF {
+	if err := decoder.Decode(&query); err != nil && err != io.EOF {
 		return nil, fmt.Errorf("unable to decode the json value: %s", err)
 	}