Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson
2017-09-23 17:20:55 +01:00
36 changed files with 88 additions and 53 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2016 the original author or authors.
* Copyright 2014-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -85,4 +85,5 @@ public class RestAssuredRestDocumentationConfigurerTests {
equalTo(RestDocumentationGenerator.ATTRIBUTE_NAME_DEFAULT_SNIPPETS),
instanceOf(List.class)));
}
}

View File

@@ -121,6 +121,7 @@ class TomcatServer extends ExternalResource {
resp.addCookie(cookie);
}
}
}