[zanata/zanata] 86e4af: Merge branch 'rhbz874342' into release

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 86e4afeb98e453af9457e7f91a2c3b9bcfb130dc
      https://github.com/zanata/zanata/commit/86e4afeb98e453af9457e7f91a2c3b9bcfb130dc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java

  Log Message:
  -----------
  Merge branch 'rhbz874342' into release


  Commit: 9c39fe883674e5e9cbcf3ea966f354ee44ad411a
      https://github.com/zanata/zanata/commit/9c39fe883674e5e9cbcf3ea966f354ee44ad411a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java

  Log Message:
  -----------
  rhbz842191, rhbz837999 - project wide search using HQL will look for null targets


  Commit: 20a5a55c48dabb582a6e80ce4ffb46146b033740
      https://github.com/zanata/zanata/commit/20a5a55c48dabb582a6e80ce4ffb46146b033740
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-11-27 (Tue, 27 Nov 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java

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


Compare: https://github.com/zanata/zanata/compare/b089f217dc4f...20a5a55c48da