projects / dbsrgits/DBIx-Class.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7244b45 e4c66bc)
Merge 'trunk' into 'cdbicompat_integration'
authorMichael G Schwern <mschwern@cpan.org>
Wed, 16 Jan 2008 10:27:08 +0000 (10:27 +0000)
committerMichael G Schwern <mschwern@cpan.org>
Wed, 16 Jan 2008 10:27:08 +0000 (10:27 +0000)
commitfcf2ffde70eb51d7df02e068ac1031d8825b161f
tree3c923f2911faff3d991b48aa467db9903a7f8ff5tree | snapshot
parent7244b45f10a538d98bdc576b8bac9e3cc8647a7fcommit | diff
parente4c66bc8b231a31e27b39b16711f0b36ad032c11commit | diff
Merge 'trunk' into 'cdbicompat_integration'

r52292@windhund (orig r3942):  schwern | 2008-01-16 02:25:36 -0800
Declare dep on JSON::Any rather than JSON.

No reason JSON::Any should prefer JSON.pm over it's default ordering.
r52293@windhund (orig r3943):  schwern | 2008-01-16 02:26:26 -0800
And fix the check in the dbicadmin test to look for JSON::Any.
The Perl ORM (dbsrgits@git.shadowcat.co.uk:DBIx-Class.git)