GitHub-Spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-05-03 04:19:47 +01:00
Code Issues Projects Releases Wiki Activity
3,756 Commits 19 Branches 364 Tags
3d3ca23d5c9d64761c08bc3f1596d80ffd41b62a
Commit Graph

5 Commits

Author SHA1 Message Date
Chris Beams 45e5b46fc2 Merge 3.1.0 development branch into trunk 
Branch in question is 'env' branch from git://git.springsource.org/sandbox/cbeams.git; merged into
git-svn repository with:

    git merge -s recursive -Xtheirs --no-commit env

No merge conflicts, but did need to

    git rm spring-build

prior to committing.

With this change, Spring 3.1.0 development is now happening on SVN
trunk. Further commits to the 3.0.x line will happen in an as-yet
uncreated SVN branch.  3.1.0 snapshots will be available
per the usual nightly CI build from trunk.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3782 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-10-25 19:48:20 +00:00
Chris Beams 49ae2e809d attempted to repro SPR-7318 to no avail 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3467 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-06-28 22:57:26 +00:00
Chris Beams 8be158bd0a Resolved SPR-6602, relating to FactoryBean behavior in @Configuration classes. See issue and code comments for full details. 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2824 50f2f4bb-b051-0410-bef5-90022cba6387
 2010-01-18 08:54:45 +00:00
Chris Beams a502272b6b Additional tests rounding out @ImportXml coverage 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2292 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-07 03:53:58 +00:00
Chris Beams 2bfa32da80 SPR-6158: Initial implementation and tests for @ImportXml 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2281 50f2f4bb-b051-0410-bef5-90022cba6387
 2009-11-07 00:32:40 +00:00