[zanata/zanata-server] 512f62: Set merge=union for release-notes.md in .gitattrib...

[GitHub]

  Branch: refs/heads/add-undertow-module
  Home:   https://github.com/zanata/zanata-server
  Commit: 512f620de51ba01058f19207e46f1a0288be5897
      https://github.com/zanata/zanata-server/commit/512f620de51ba01058f19207e46f1a0288be5897
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    A docs/.gitattributes

  Log Message:
  -----------
  Set merge=union for release-notes.md in .gitattributes


  Commit: 435fa361dc103fe1f4436141fd9ee4f32fdee12e
      https://github.com/zanata/zanata-server/commit/435fa361dc103fe1f4436141fd9ee4f32fdee12e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java

  Log Message:
  -----------
  Handle missing/empty proxy header


  Commit: 4cb4b3766a4aa8a4a5b4e507d3158595c542b33d
      https://github.com/zanata/zanata-server/commit/4cb4b3766a4aa8a4a5b4e507d3158595c542b33d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java

  Log Message:
  -----------
  Merge pull request #771 from zanata/handle-missing-proxy-header

Handle missing/empty proxy header


  Commit: 86d1ae0665888e5f83dbc91f4e27b7cca7af5288
      https://github.com/zanata/zanata-server/commit/86d1ae0665888e5f83dbc91f4e27b7cca7af5288
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    A docs/.gitattributes

  Log Message:
  -----------
  Merge pull request #769 from zanata/merge-release-notes

Set merge=union for release-notes.md in .gitattributes


  Commit: 8e11a04e0e42e00520bcb501d68211d7f86667ce
      https://github.com/zanata/zanata-server/commit/8e11a04e0e42e00520bcb501d68211d7f86667ce
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #768 from zanata/add-undertow-module

Add Undertow modules for WildFly tests


  Commit: e3ffc75a09875eb20b697ae315b742ae2d072e30
      https://github.com/zanata/zanata-server/commit/e3ffc75a09875eb20b697ae315b742ae2d072e30
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Revert "Add Undertow modules from WildFly 9 for WildFly tests"

This reverts commit c40c2ddbb773456f98817cc0a4e332e51583e5b5.


  Commit: 80a2ec2e71423baed26fed35067587722bbe40c6
      https://github.com/zanata/zanata-server/commit/80a2ec2e71423baed26fed35067587722bbe40c6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Add Undertow modules from WildFly 9 for WildFly tests


Compare: https://github.com/zanata/zanata-server/compare/c40c2ddbb773...80a2ec2e7142