Merge branch '1.1.x'

2014-12-22 20:29:11 -08:00
parent e57b0e00f2 7d017a2a6b
commit 4ed42aac37
8 changed files with 326 additions and 0 deletions
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -36,6 +36,7 @@
 		<module>spring-boot-sample-data-rest</module>
 		<module>spring-boot-sample-data-solr</module>
 		<module>spring-boot-sample-flyway</module>
+		<module>spring-boot-sample-hateoas</module>
 		<module>spring-boot-sample-hornetq</module>
 		<module>spring-boot-sample-integration</module>
 		<module>spring-boot-sample-jersey</module>