1. 06 Jul, 2015 21 commits
  2. 05 Jul, 2015 2 commits
  3. 04 Jul, 2015 2 commits
  4. 03 Jul, 2015 6 commits
    • Dave Syer's avatar
      Documentation for default profiles · eb49f4bf
      Dave Syer authored
      eb49f4bf
    • Dave Syer's avatar
      Load configuration from default profiles if no others active · dc8ba2c5
      Dave Syer authored
      Before this change if no profile is active yaml documents with
      spring.profiles=default were loaded, but they are also loaded
      if there *is* an active profile which is more of a problem. In
      addition if the user chanes the default profile in the
      Environmemt Spring Boot ignore that value ("default" is a magic
      String).
      
      After this change:
      
      * If no profile is explicitly active, the default profiles from
      the Environment are used explicitly
      * The default profiles cause properties to be loaded just like
      other profiles, so from YAML documents with spring.profiles and
      from files in application-default.properties for instance
      * The default profiles are not active when any other profile is
      * Properties defined in "top-level" YAML documents with no
      specific spring.profiles still act as defaults for *all* profiles
      
      Fixes gh-1219, fixes gh-2623
      dc8ba2c5
    • Stephane Nicoll's avatar
      Merge pull request #3411 from izeye/typo · dfbabefc
      Stephane Nicoll authored
      * pr/3411:
        Fix typo
      dfbabefc
    • izeye's avatar
      Fix typo · b4f636b3
      izeye authored
      Closes gh-3411
      b4f636b3
    • Stephane Nicoll's avatar
      Merge pull request #3401 from sbrannen/3400 · 6aefd20c
      Stephane Nicoll authored
      * pr/3401:
        Use @AliasFor in @SpringApplicationConfiguration
      6aefd20c
    • Sam Brannen's avatar
      Use @AliasFor in @SpringApplicationConfiguration · 9cea8925
      Sam Brannen authored
      Spring Framework 4.2 introduces first-class support for explicit
      annotation attribute overrides via a new @AliasFor annotation.
      
      In order to avoid potential naming conflicts in the future and to make
      the current, implicit attribute overrides explicit (as well as
      documented), this commit retrofits @SpringApplicationConfiguration with
      @AliasFor.
      
      Closes gh-3400
      Closes gh-3401
      9cea8925
  5. 02 Jul, 2015 9 commits