root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #7253 from izeye:typo-20161031 

* pr/7253:
  Fix typo
This commit is contained in:
Stephane Nicoll 2016-10-31 11:38:35 +01:00
parent 974ec92ad6 7bb63238ab
commit dc25478000
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/LoggersMvcEndpointTests.java
View File

@ -110,7 +110,7 @@ public class LoggersMvcEndpointTests {
} }
@Test @Test
public void getLoggesWhenDisabledShouldReturnNotFound() throws Exception { public void getLoggersRootWhenDisabledShouldReturnNotFound() throws Exception {
this.context.getBean(LoggersEndpoint.class).setEnabled(false); this.context.getBean(LoggersEndpoint.class).setEnabled(false);
this.mvc.perform(get("/loggers/ROOT")).andExpect(status().isNotFound()); this.mvc.perform(get("/loggers/ROOT")).andExpect(status().isNotFound());
} }

2
spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt.vm
View File

@ -33,7 +33,7 @@
</executions> </executions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.example</groupid> <groupId>com.example</groupId>
<artifactId>custom-layout</artifactId> <artifactId>custom-layout</artifactId>
<version>0.0.1.BUILD-SNAPSHOT</version> <version>0.0.1.BUILD-SNAPSHOT</version>
</dependency> </dependency>

2
spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
View File

@ -68,7 +68,7 @@ public enum DatabaseDriver {
/** /**
* Maria DB. * Maria DB.
*/ */
MARIADB("maridb", "MySQL", "org.mariadb.jdbc.Driver", MARIADB("mariadb", "MySQL", "org.mariadb.jdbc.Driver",
"org.mariadb.jdbc.MariaDbDataSource", "SELECT 1"), "org.mariadb.jdbc.MariaDbDataSource", "SELECT 1"),
/** /**