[zanata/zanata-server] 696a38: Upgrade to JavaMelody 1.60.0 (#1263)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 696a38f3a1aced12a8b2b10c0b72868278acb3a4
      https://github.com/zanata/zanata-server/commit/696a38f3a1aced12a8b2b10c0b72868278acb3a4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-08-08 (Mon, 08 Aug 2016)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Upgrade to JavaMelody 1.60.0 (#1263)


  Commit: 34ea90d1a28d0bcf1a2fcb5859c4df1b9885b88b
      https://github.com/zanata/zanata-server/commit/34ea90d1a28d0bcf1a2fcb5859c4df1b9885b88b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-08-09 (Tue, 09 Aug 2016)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge commit '696a38f3a1aced12a8b2b10c0b72868278acb3a4' into HEAD


Compare: https://github.com/zanata/zanata-server/compare/fd5b2feb5888...34ea90d1a28d