tree 40e02e1ff10cf34869013f333ac64b31c7a07869
parent 1324d618941127d1b76cb22c96cb75ec73ab8fa7
parent 46d8ae1f7329be4e7923ae6b05909a2dbf3d5198
author David Pursehouse <david.pursehouse@sonymobile.com> 1404174529 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1404174624 +0900

Merge branch 'stable-1.7'

* stable-1.7:
  gwtorm 1.7.1
  Add transaction support for Jdbc dialects
  Fix a bug where "LIMIT ?" in queries was omitted in the generated query
  Drop "bar" tables in test setup
  Start 1.7.1 development

All the changes on stable-1.7 already exist on master.
Merged with `-s ours`.

Change-Id: I28c4a3f5757b85f0bb17ec2089e7682c1bbdb1bb