[zanata/zanata-server] 0e0bae: Update to zanata assets 6.1.1

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 0e0bae6f1f33bc193b1000a902324e602eb1808f
      https://github.com/zanata/zanata-server/commit/0e0bae6f1f33bc193b1000a902324e602eb1808f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-05 (Tue, 05 May 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update to zanata assets 6.1.1


  Commit: b7321254cf3addb8cbf4599ee9e1877788027800
      https://github.com/zanata/zanata-server/commit/b7321254cf3addb8cbf4599ee9e1877788027800
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-05 (Tue, 05 May 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java

  Log Message:
  -----------
  Unignore tests for RHBZ1216304


  Commit: b0e4e38b92132ee09650377a04e32efabbcb734e
      https://github.com/zanata/zanata-server/commit/b0e4e38b92132ee09650377a04e32efabbcb734e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-05-05 (Tue, 05 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java

  Log Message:
  -----------
  Remove slow findElements wait from waitForPageSilence


  Commit: eaa215b2df20bc33eddf87ba2eadff6132a4180a
      https://github.com/zanata/zanata-server/commit/eaa215b2df20bc33eddf87ba2eadff6132a4180a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #782 from zanata/assets611

Update to zanata assets 6.1.1


  Commit: 7d04d5b64dce984a2bfb1d8f00b79ff019dbce76
      https://github.com/zanata/zanata-server/commit/7d04d5b64dce984a2bfb1d8f00b79ff019dbce76
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into integration/master

Conflicts:
	zanata-war/pom.xml


Compare: https://github.com/zanata/zanata-server/compare/7b514b8f7887...7d04d5b64dce