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

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2016-10-24 11:39:26 +02:00
parent beb3074998 713fd51f9c
commit eddb10e4c9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-docs/src/main/asciidoc/deployment.adoc
View File

@ -548,9 +548,12 @@ the following example and place it in `/etc/systemd/system` directory:
TIP: Remember to change the `Description`, `User` and `ExecStart` fields for your TIP: Remember to change the `Description`, `User` and `ExecStart` fields for your
application. application.
TIP: Note that `ExecStart` field does not declare the script action command, which means
that `run` command is used by default.
Note that unlike when running as an `init.d` service, user that runs the application, PID Note that unlike when running as an `init.d` service, user that runs the application, PID
file and console log file behave differently under `systemd` and must be configured using file and console log file are managed by `systemd` itself and therefore must be configured
appropriate fields in '`service`' script. Consult the using appropriate fields in '`service`' script. Consult the
http://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit http://www.freedesktop.org/software/systemd/man/systemd.service.html[service unit
configuration man page] for more details. configuration man page] for more details.

3
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java
View File

@ -37,8 +37,9 @@ import org.springframework.util.ReflectionUtils.FieldCallback;
* annotations. * annotations.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.4.2
*/ */
class MockitoTestExecutionListener extends AbstractTestExecutionListener { public class MockitoTestExecutionListener extends AbstractTestExecutionListener {
@Override @Override
public void prepareTestInstance(TestContext testContext) throws Exception { public void prepareTestInstance(TestContext testContext) throws Exception {