[zanata/zanata-server] b9b4c7: Merge branch 'ensure-innodb' into ensure-innodb-on...

[GitHub]

  Branch: refs/heads/ensure-innodb-on-37
  Home:   https://github.com/zanata/zanata-server
  Commit: b9b4c7ad3f6ada9a4da0620620ccd9a2296e0b05
      https://github.com/zanata/zanata-server/commit/b9b4c7ad3f6ada9a4da0620620ccd9a2296e0b05
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-04 (Mon, 04 May 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml
    A zanata-liquibase/pom.xml
    A zanata-liquibase/src/main/java/liquibase/ext/CreateTableGeneratorInnoDB.java
    A zanata-liquibase/src/main/java/liquibase/ext/MySQLDatabaseWithLog.java
    M zanata-war/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    A zanata-war/src/main/resources/db/changelogs/db.changelog-validations.xml
    M zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  Merge branch 'ensure-innodb' into ensure-innodb-on-37

Conflicts:
	zanata-war/pom.xml
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml