mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
# Conflicts: # ebean-core/src/main/java/io/ebeaninternal/server/deploy/TablespaceMeta.java # ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java # ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java # ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java # ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java # ebean-test/src/test/java/misc/migration/v1_0/EBasic.java # ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java # ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java # ebean-test/src/test/java/org/tests/json/TestDbJson_List.java # ebean-test/src/test/resources/extra-ddl.xml # ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations # ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations # ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/I__create_tablespaces.sql # ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations # ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations # ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml # ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml