10785 Commits (5f2bd1667be119d6a112bd50fc82396e2a1e68ea)
 

Author SHA1 Message Date
Stephane Nicoll 5f2bd1667b Merge branch '1.5.x' 9 years ago
Stephane Nicoll e88bda4682 Avoid extra space if condition is empty 9 years ago
Andy Wilkinson aa09dbbd79 Build against Social snapshots for better compatibility 9 years ago
Andy Wilkinson 84be46a55f Merge branch '1.5.x' 9 years ago
Andy Wilkinson a1895336fb Merge pull request #8206 from Jack Stevenson 9 years ago
Jack Stevenson 549f90e996 Provide dependency management for HikariCP-java7 9 years ago
Andy Wilkinson 218d05232e Merge branch '1.5.x' 9 years ago
Andy Wilkinson 4b0abc7afc Merge pull request #8199 from John Blum 9 years ago
John Blum d83ed7f3b3 Upgrade to GemFire 8.2.2 9 years ago
Brian Clozel 8619d6a229 Rename EmbeddedServletContainer -> EmbeddedWebServer 9 years ago
Andy Wilkinson 457d0414ea Make ConditionalOnBean a logical AND rather than an OR 9 years ago
Brian Clozel 250a1601d7 Add WebApplicationType.REACTIVE type 9 years ago
Brian Clozel 0aaea05a4b Add Reactor Netty and WebFlux Starters 9 years ago
Stephane Nicoll 3c6d630a62 Merge branch '1.5.x' 9 years ago
Stephane Nicoll 519a03ccda Polish 9 years ago
Stephane Nicoll 8c31000efa Merge pull request #8204 from izeye:fix-test-20170206 9 years ago
Johnny Lim 09998d1155 Fix ImportAutoConfigurationImportSelectorTests.determineImportsWhenUsingNonMetaWithClassesShouldBeSame() 9 years ago
Stephane Nicoll 6af6e8e31b Remove auto-configuration for ServerProperties 9 years ago
Stephane Nicoll e0c8e1f514 Ignore test until couchbase support is restored 9 years ago
Stephane Nicoll 1061afbe00 Reuse `ConfigurationProperties` bean defined in parent 9 years ago
Stephane Nicoll 98d2ed85e4 Fix broken build 9 years ago
Stephane Nicoll e9029d223a Upgrade to Couchbase client 2.4.1 9 years ago
Stephane Nicoll cfdc75d384 Merge branch '1.5.x' 9 years ago
Stephane Nicoll e9057354c2 Merge pull request #8198 from izeye:logical-and 9 years ago
Johnny Lim 0adab8a2be Use logical 'and' instead of bitwise 'and' 9 years ago
Stephane Nicoll b4858882f3 Merge pull request #8202 from jxblum:spring-boot-sample-cache-ux-improvements 9 years ago
Stephane Nicoll 4d7b03b002 Polish contribution 9 years ago
John Blum 31ed70e1b8 Improve spring-boot-sample-cache UX by using Maven profiles 9 years ago
Phillip Webb d8e1297eed Merge branch '1.5.x' 9 years ago
Phillip Webb 87b8ce61de Fix Invalid target for Validator error 9 years ago
Stephane Nicoll fb19b36595 Merge branch '1.5.x' 9 years ago
Stephane Nicoll dc75f13754 Remove deprecated metadata for spring.pidfile 9 years ago
Stephane Nicoll 3d1f8aa8d7 Merge branch '1.4.x' into 1.5.x 9 years ago
Stephane Nicoll 21e866535c Merge pull request #8196 from zhanhb:patch-1 9 years ago
Stephane Nicoll a30461c5c7 Polish pid metadata 9 years ago
zhanhb 22ba7b93b2 Fix pid properties link in documentation 9 years ago
Stephane Nicoll 513db481a6 Merge pull request #8147 from shakuzen:patch-13 9 years ago
Tommy Ludwig 653366d664 Remove HikariCP-java6 dependency management 9 years ago
Andy Wilkinson aa19cad770 Merge branch '1.5.x' 9 years ago
Andy Wilkinson b9b0cdb342 Merge branch '1.4.x' into 1.5.x 9 years ago
Andy Wilkinson 2f50d515a1 Apply root to URIs directly rather than relying on expansion 9 years ago
Andy Wilkinson 07c39f1c62 Upgrade to AssertJ 3.6.2 9 years ago
Andy Wilkinson 77b5c63ec0 Build against SI 5.0.0 snapshots in preparation for M3 9 years ago
Andy Wilkinson 071668a2e6 Start building against Spring Kafka 2.0 snapshots 9 years ago
Stephane Nicoll 10ca22082b Polish 9 years ago
Stephane Nicoll 5c663a9ece Merge branch '1.5.x' 9 years ago
Stephane Nicoll 9b952dd3a8 Merge pull request #8148 from izeye:polish-20170131 9 years ago
Johnny Lim 846994e498 Polish 9 years ago
Stephane Nicoll eca61af8b1 Merge pull request #8161 from izeye:clean-system-property 9 years ago
Johnny Lim cedc4cd9f4 Clear system property in SpringApplicationTests 9 years ago