Phillip Webb 6b083d7e0b Merge branch '1.1.x' ... Conflicts: pom.xml spring-boot-actuator/pom.xml spring-boot-autoconfigure/pom.xml spring-boot-cli/pom.xml spring-boot-dependencies/pom.xml spring-boot-docs/pom.xml spring-boot-full-build/pom.xml spring-boot-integration-tests/pom.xml spring-boot-parent/pom.xml spring-boot-samples/pom.xml spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml spring-boot-samples/spring-boot-sample-actuator/pom.xml spring-boot-samples/spring-boot-sample-amqp/pom.xml spring-boot-samples/spring-boot-sample-aop/pom.xml spring-boot-samples/spring-boot-sample-batch/pom.xml spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml spring-boot-samples/spring-boot-sample-data-jpa/pom.xml spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml spring-boot-samples/spring-boot-sample-data-redis/pom.xml spring-boot-samples/spring-boot-sample-data-rest/pom.xml spring-boot-samples/spring-boot-sample-data-solr/pom.xml spring-boot-samples/spring-boot-sample-flyway/pom.xml spring-boot-samples/spring-boot-sample-hornetq/pom.xml spring-boot-samples/spring-boot-sample-integration/pom.xml spring-boot-samples/spring-boot-sample-jetty/pom.xml spring-boot-samples/spring-boot-sample-liquibase/pom.xml spring-boot-samples/spring-boot-sample-parent-context/pom.xml spring-boot-samples/spring-boot-sample-profile/pom.xml spring-boot-samples/spring-boot-sample-secure/pom.xml spring-boot-samples/spring-boot-sample-servlet/pom.xml spring-boot-samples/spring-boot-sample-simple/pom.xml spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml spring-boot-samples/spring-boot-sample-tomcat/pom.xml spring-boot-samples/spring-boot-sample-tomcat8-jsp/pom.xml spring-boot-samples/spring-boot-sample-traditional/pom.xml spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml spring-boot-samples/spring-boot-sample-web-jsp/pom.xml spring-boot-samples/spring-boot-sample-web-method-security/pom.xml spring-boot-samples/spring-boot-sample-web-secure/pom.xml spring-boot-samples/spring-boot-sample-web-static/pom.xml spring-boot-samples/spring-boot-sample-web-ui/pom.xml spring-boot-samples/spring-boot-sample-web-velocity/pom.xml spring-boot-samples/spring-boot-sample-websocket/pom.xml spring-boot-samples/spring-boot-sample-ws/pom.xml spring-boot-samples/spring-boot-sample-xml/pom.xml spring-boot-starters/pom.xml spring-boot-starters/spring-boot-starter-actuator/pom.xml spring-boot-starters/spring-boot-starter-amqp/pom.xml spring-boot-starters/spring-boot-starter-aop/pom.xml spring-boot-starters/spring-boot-starter-batch/pom.xml spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml spring-boot-starters/spring-boot-starter-data-jpa/pom.xml spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml spring-boot-starters/spring-boot-starter-data-rest/pom.xml spring-boot-starters/spring-boot-starter-data-solr/pom.xml spring-boot-starters/spring-boot-starter-freemarker/pom.xml spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml spring-boot-starters/spring-boot-starter-hornetq/pom.xml spring-boot-starters/spring-boot-starter-integration/pom.xml spring-boot-starters/spring-boot-starter-jdbc/pom.xml spring-boot-starters/spring-boot-starter-jetty/pom.xml spring-boot-starters/spring-boot-starter-log4j/pom.xml spring-boot-starters/spring-boot-starter-logging/pom.xml spring-boot-starters/spring-boot-starter-mobile/pom.xml spring-boot-starters/spring-boot-starter-parent/pom.xml spring-boot-starters/spring-boot-starter-redis/pom.xml spring-boot-starters/spring-boot-starter-remote-shell/pom.xml spring-boot-starters/spring-boot-starter-security/pom.xml spring-boot-starters/spring-boot-starter-social-facebook/pom.xml spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml spring-boot-starters/spring-boot-starter-social-twitter/pom.xml spring-boot-starters/spring-boot-starter-test/pom.xml spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml spring-boot-starters/spring-boot-starter-tomcat/pom.xml spring-boot-starters/spring-boot-starter-velocity/pom.xml spring-boot-starters/spring-boot-starter-web/pom.xml spring-boot-starters/spring-boot-starter-websocket/pom.xml spring-boot-starters/spring-boot-starter-ws/pom.xml spring-boot-starters/spring-boot-starter/pom.xml spring-boot-tools/pom.xml spring-boot-tools/spring-boot-dependency-tools/pom.xml spring-boot-tools/spring-boot-gradle-plugin/pom.xml spring-boot-tools/spring-boot-loader-tools/pom.xml spring-boot-tools/spring-boot-loader/pom.xml spring-boot-tools/spring-boot-maven-plugin/pom.xml spring-boot-versions/pom.xml spring-boot/pom.xml		2014-08-07 13:16:27 -07:00
..
src	Apply latest eclipse cleanup rules	2014-01-21 16:28:26 -08:00
application.yml	Add extra test for partial overrides	2013-11-22 08:51:02 +00:00
build.gradle	Merge branch '1.1.x'	2014-08-07 13:16:27 -07:00
pom.xml	Next development version	2014-08-07 11:59:17 -07:00