Merge branch '1.2.x'

2015-04-13 11:41:03 -07:00
parent 24ca44dbb4 dd19dd70c5
commit e1152b4db8
1 changed files with 8 additions and 0 deletions
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -638,6 +638,14 @@ For example, given the following `@ConfigurationProperties` class:

 		private String firstName;

+		public String getFirstName() {
+			return this.firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
 	}
 ----