pekko/akka-docs/rst/scala/code/docs/http/scaladsl/server/directives
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
..
BasicDirectivesExamplesSpec.scala !htt #19514 Update RouterSettings to be non case class 2016-01-25 17:09:03 +01:00
CodingDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
CookieDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
CustomDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
DebuggingDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
ExecutionDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
FileAndResourceDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
FileUploadDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
FormFieldDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
FutureDirectivesExamplesSpec.scala Merge pull request #19715 from ktoso/wip-done-marshalling 2016-02-10 10:11:16 +01:00
HeaderDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
HostDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
MarshallingDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
MethodDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
MiscDirectivesExamplesSpec.scala =htt #19388 Fixing broken test in akka-docs from RemoteAddress changes 2016-02-10 13:14:04 -05:00
ParameterDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
PathDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
RangeDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
RespondWithDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
RouteDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
SchemeDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
SecurityDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00
WebSocketDirectivesExamplesSpec.scala =pro #19068 All copyrights ranges and single years updated to a range ending in 2016 2016-01-25 10:20:30 +01:00