Merge branch 'master' into loop-libev

igorw · igorw · commit e8173fea3e86 · 2012-11-13T00:00:05.000+01:00
* master:
  Fix CHANGELOG indentation
  Fix branch aliases of subtree splits to be 0.2-dev
  [Http] Correctly emit end event for Request
  [Http] Correctly emit close event in response
  Add guzzle deps update to CHANGELOG
  Update guzzle dependencies to 3.0.*
  [Http] Make response forward drain events from the connection
  Rename $resolver to $dns in examples
  Add new test-memory script that only tests the loop

Conflicts:
	CHANGELOG.md
	composer.lock
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
     "target-dir": "React/EventLoop",
     "extra": {
         "branch-alias": {
-            "dev-master": "0.2"
+            "dev-master": "0.2-dev"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"target-dir": "React/EventLoop",`
`17`	`17`	`"extra": {`
`18`	`18`	`"branch-alias": {`
`19`		`- "dev-master": "0.2"`
	`19`	`+ "dev-master": "0.2-dev"`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`