[zanata/zanata-platform] 7983ad: fix(ZNTA-1780): Null pointer exception in OpenID m...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-platform
  Commit: 7983adfd63020c7f9ee045424433b16345f06a1e
      https://github.com/zanata/zanata-platform/commit/7983adfd63020c7f9ee045424433b16345f06a1e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    A server/zanata-war/src/test/java/org/zanata/action/AccountMergeActionTest.java

  Log Message:
  -----------
  fix(ZNTA-1780): Null pointer exception in OpenID merge (#221)

* fix(ZNTA-1780): Null pointer exception in OpenID merge
* fix(ZNTA-1780): Add tests to OpenID fix


  Commit: 06b63bc407c911e31471c0ff10dece2642864aa8
      https://github.com/zanata/zanata-platform/commit/06b63bc407c911e31471c0ff10dece2642864aa8
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2017-03-07 (Tue, 07 Mar 2017)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    A server/zanata-war/src/test/java/org/zanata/action/AccountMergeActionTest.java

  Log Message:
  -----------
  Merge commit '7983adfd63020c7f9ee045424433b16345f06a1e' into HEAD


Compare: https://github.com/zanata/zanata-platform/compare/427d64bc6841...06b63bc407c9