[zanata/zanata-server] f9ef06: Update 'archived' to 'deleted' in activity table

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: f9ef06883aa2c508e5802843d543979570929ab1
      https://github.com/zanata/zanata-server/commit/f9ef06883aa2c508e5802843d543979570929ab1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/stats.xhtml

  Log Message:
  -----------
  Update 'archived' to 'deleted' in activity table


  Commit: 4e3f7e67b0a6c392975f46f0d55f3b786630b04d
      https://github.com/zanata/zanata-server/commit/4e3f7e67b0a6c392975f46f0d55f3b786630b04d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1230424-update-archive-to-delete


  Commit: 3e3ca4a896cd3c61b2e4ca460475eb9705dc5171
      https://github.com/zanata/zanata-server/commit/3e3ca4a896cd3c61b2e4ca460475eb9705dc5171
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/stats.xhtml

  Log Message:
  -----------
  Merge pull request #860 from zanata/rhbz1230424-update-archive-to-delete

Update 'archived' to 'deleted' in activity table


Compare: https://github.com/zanata/zanata-server/compare/c30800a09c36...3e3ca4a896cd