[zanata/zanata-platform] a7dfd7: ZNTA-2227 auto merge saml user to existing account

[GitHub]

  Branch: refs/heads/ZNTA-2227-auto-merge-account
  Home:   https://github.com/zanata/zanata-platform
  Commit: a7dfd7f0b4f9118fa959f3c90ac39635f460004e
      https://github.com/zanata/zanata-platform/commit/a7dfd7f0b4f9118fa959f3c90ac39635f460004e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M server/docker/conf/zanata-config.cli
    A server/services/src/main/java/org/zanata/security/SamlAccountService.kt
    M server/services/src/main/java/org/zanata/servlet/SAMLFilter.kt
    A server/services/src/test/java/org/zanata/security/SamlAccountServiceTest.kt
    M server/services/src/test/java/org/zanata/servlet/SAMLFilterTest.kt

  Log Message:
  -----------
  ZNTA-2227 auto merge saml user to existing account