Merge branch '1.1.x' into 1.2.x

ramari16 · Mar 2, 2015 · 0174476 · 0174476
2 parents 561ed99 + 50e1f80
commit 0174476
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 356 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,4 @@ overridedb.*
 .idea
 *.jar
 .DS_Store
+.factorypath
diff --git a/spring-boot-docs/.factorypath b/spring-boot-docs/.factorypath
diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j2/.factorypath b/spring-boot-samples/spring-boot-sample-actuator-log4j2/.factorypath
diff --git a/spring-boot-starters/spring-boot-starter-log4j2/.factorypath b/spring-boot-starters/spring-boot-starter-log4j2/.factorypath
diff --git a/spring-boot-tools/spring-boot-maven-plugin/.factorypath b/spring-boot-tools/spring-boot-maven-plugin/.factorypath
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,3 +31,4 @@ overridedb.* @@
     .idea
     *.jar
     .DS_Store
+    .factorypath