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

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Andy Wilkinson 2016-12-13 10:02:52 +00:00
parent 391a760c3c 14a90aa52e
commit d9e2368512
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
View File

@ -46,12 +46,12 @@ import org.springframework.core.io.ResourceLoader;
* new SpringApplicationBuilder(ParentConfig.class).child(ChildConfig.class).run(args); * new SpringApplicationBuilder(ParentConfig.class).child(ChildConfig.class).run(args);
* </pre> * </pre>
* *
* Another common use case is setting default arguments, e.g. active Spring profiles, to * Another common use case is setting active profiles and default properties to set up the
* set up the environment for an application: * environment for an application:
* *
* <pre class="code"> * <pre class="code">
* new SpringApplicationBuilder(Application.class).profiles(&quot;server&quot;) * new SpringApplicationBuilder(Application.class).profiles(&quot;server&quot;)
* .defaultArgs(&quot;--transport=local&quot;).run(args); * .properties(&quot;transport=local&quot;).run(args);
* </pre> * </pre>
* *
* <p> * <p>