+pro,hco,par Make sure that things build on both 2.10 and 2.11

2014-06-25 14:32:29 +02:00 · 2014-06-25 14:32:29 +02:00 · e32ba9c54a
commit e32ba9c54a
parent 8ff980c693
12 changed files with 450 additions and 20 deletions
--- a/akka-docs-dev/rst/scala/code/docs/http/HttpServerExampleSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/HttpServerExampleSpec.scala
@ -64,7 +64,7 @@ class HttpServerExampleSpec
      case HttpRequest(GET, Uri.Path("/"), _, _, _) ⇒
        HttpResponse(
          entity = HttpEntity(MediaTypes.`text/html`,
-            <html><body>Hello world!</body></html>.toString))
+            "<html><body>Hello world!</body></html>"))

      case HttpRequest(GET, Uri.Path("/ping"), _, _, _)  ⇒ HttpResponse(entity = "PONG!")
      case HttpRequest(GET, Uri.Path("/crash"), _, _, _) ⇒ sys.error("BOOM!")