1. 19 Mar, 2014 3 commits
    • Dave Syer's avatar
      Change order of config file locations to be more natural · a47d5ccd
      Dave Syer authored
      The most natural order is "more specific locations win". That way
      if a use has application.properties in the root of a JAR (as is
      normal), overrides can always be made on
      classpath:/config/application.properties (as well as
      file:./application.properties which has always been the case).
      
      Before this change properties in classpath:/config/* were over
      written by those in the root location, not the other way round.
      
      Fixes gh-527
      a47d5ccd
    • Stephane Nicoll's avatar
      Add a note on maven filtering · d6be3dfb
      Stephane Nicoll authored
      This commit adds a documentation note explaining how to change
      the delimiters used to filter maven tokens as these conflict with the
      delimiters used by Spring (i.e. ${foo:default}).
      d6be3dfb
    • Phillip Webb's avatar
      Fix typo · 24cc51c3
      Phillip Webb authored
      24cc51c3
  2. 18 Mar, 2014 29 commits
  3. 17 Mar, 2014 8 commits