Fix typo in javadoc
Merge pull request #1633 from johnktims/master

* pull1633:
  Fix typo in javadoc
Add missing @Param annotations to CityRepository in Data REST sample

Without the @Param annotations, using either of the search URIs would
resulted in a 400 response and an error describing the lack of @Param
annotation.

See gh-1627
Add tests to Data REST sample for search operations

Closes gh-1627
Merge branch 'gh-1627' into 1.1.x
Merge branch '1.1.x'
Make Jackson date format and property naming strategy configurable

Allow the environment to be used to configure Jackson's date format
and property naming strategy

Closes gh-1628
Fix missing resource exception if spring-cloud not on classpath
Default prefix for redis keys doesn't need period
Merge branch 'master' of https://github.com/spring-projects/spring-boot