pekko/akka-docs/rst/scala/code/docs/http/scaladsl
Chris Baxter fbd12c7c83 =htt #19388 Fixing broken test in akka-docs from RemoteAddress changes
Also dealing with merge conflicts from my fork's head

Conflicts:
	akka-http-core/src/test/scala/akka/http/impl/engine/parsing/HttpHeaderParserSpec.scala
	akka-http-core/src/test/scala/akka/http/impl/model/parser/HttpHeaderSpec.scala
2016-02-10 13:14:04 -05:00
..
server =htt #19388 Fixing broken test in akka-docs from RemoteAddress changes 2016-02-10 13:14:04 -05:00
HttpClientExampleSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
HttpServerExampleSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
MarshalSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
ModelSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
SprayJsonExampleSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
UnmarshalSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
WebSocketClientExampleSpec.scala =doc #19315 docs for websocket client 2016-02-04 16:12:41 +01:00