Branch: refs/heads/damason/settings/ZNTA-1927
  Home:   https://github.com/zanata/zanata-platform
  Commit: 436cdfd5418127eaf34048adef205302783d45bc
      
https://github.com/zanata/zanata-platform/commit/436cdfd5418127eaf34048adef205302783d45bc
  Author: kgough <kgo...@redhat.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M 
server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java

  Log Message:
  -----------
  fix(ZNTA-2206) Help link now points to docs.zanata.org


  Commit: 412728a60e95da397c5893c395bb3f5cde73904f
      
https://github.com/zanata/zanata-platform/commit/412728a60e95da397c5893c395bb3f5cde73904f
  Author: kgough <kgo...@redhat.com>
  Date:   2017-09-20 (Wed, 20 Sep 2017)

  Changed paths:
    M 
server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java

  Log Message:
  -----------
  fix(ZNTA-2206) update help link in test file


  Commit: 32fcedf9b2f7fd9cdaaeb066ef1aed8c526e1169
      
https://github.com/zanata/zanata-platform/commit/32fcedf9b2f7fd9cdaaeb066ef1aed8c526e1169
  Author: kgough <kgo...@redhat.com>
  Date:   2017-09-20 (Wed, 20 Sep 2017)

  Changed paths:
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml

  Log Message:
  -----------
  fix(ZNTA-2206) update help link in db test


  Commit: fed4c4c3821dffb0af5c1d316158f39a33f6838e
      
https://github.com/zanata/zanata-platform/commit/fed4c4c3821dffb0af5c1d316158f39a33f6838e
  Author: kathryngo <kgo...@redhat.com>
  Date:   2017-09-20 (Wed, 20 Sep 2017)

  Changed paths:
    M 
server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M 
server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml

  Log Message:
  -----------
  Merge pull request #525 from zanata/ZNTA-2206

fix(ZNTA-2206) Help link now points to docs.zanata.org


  Commit: 3508c064da8c6dc7e4cd7923a0fab7db30f337b2
      
https://github.com/zanata/zanata-platform/commit/3508c064da8c6dc7e4cd7923a0fab7db30f337b2
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M 
server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M 
server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml

  Log Message:
  -----------
  Merge commit 'fed4c4c3821dffb0af5c1d316158f39a33f6838e' into HEAD


  Commit: 7ec825d80c3eb90e4110d0b95b532ec25a3f6b1c
      
https://github.com/zanata/zanata-platform/commit/7ec825d80c3eb90e4110d0b95b532ec25a3f6b1c
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-09-20 (Wed, 20 Sep 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/actions/glossary-actions.js

  Log Message:
  -----------
  fix: glossary upload (#526)

https://zanata.atlassian.net/browse/ZNTA-2208


  Commit: 7614dbc0c05d5f00e931e88f67bab3107af71827
      
https://github.com/zanata/zanata-platform/commit/7614dbc0c05d5f00e931e88f67bab3107af71827
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2017-09-20 (Wed, 20 Sep 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/actions/glossary-actions.js

  Log Message:
  -----------
  Merge commit '7ec825d80c3eb90e4110d0b95b532ec25a3f6b1c' into HEAD


  Commit: b1734decb013ed4bfde0a479e0a04ec5b30c607c
      
https://github.com/zanata/zanata-platform/commit/b1734decb013ed4bfde0a479e0a04ec5b30c607c
  Author: kgough <kgo...@redhat.com>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  fix(ZNTA-2220) remove scrollbars from modals that don't need scrolling


  Commit: b067ed498431b46e1b71cd8d4d9a49ed185bc9d4
      
https://github.com/zanata/zanata-platform/commit/b067ed498431b46e1b71cd8d4d9a49ed185bc9d4
  Author: kathryngo <kgo...@redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  Merge pull request #528 from zanata/modal-fix

fix(ZNTA-2220) remove scrollbars from modals that don't need scrolling


  Commit: 211ee4aaf770c57b6554d278d8b77764e6051976
      
https://github.com/zanata/zanata-platform/commit/211ee4aaf770c57b6554d278d8b77764e6051976
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2017-09-24 (Sun, 24 Sep 2017)

  Changed paths:
    M server/zanata-frontend/src/frontend/app/styles/style.less

  Log Message:
  -----------
  Merge commit 'b067ed498431b46e1b71cd8d4d9a49ed185bc9d4' into HEAD


  Commit: f44eb39273acb633b951a555fbae03935537dfb2
      
https://github.com/zanata/zanata-platform/commit/f44eb39273acb633b951a555fbae03935537dfb2
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M 
server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java

  Log Message:
  -----------
  fix: TM serializable issue (#529)

https://zanata.atlassian.net/browse/ZNTA-2218:


  Commit: b18850364bf0a39cab3e865663f256076119c5eb
      
https://github.com/zanata/zanata-platform/commit/b18850364bf0a39cab3e865663f256076119c5eb
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M Jenkinsfile

  Log Message:
  -----------
  Reduce verbosity at tail of build log (#532)

This should make it easier to find the cause if build fails.


  Commit: 2bce2848b4d56d5a00c0a644c4aba1967d71b2da
      
https://github.com/zanata/zanata-platform/commit/2bce2848b4d56d5a00c0a644c4aba1967d71b2da
  Author: bendem <onl...@bendem.be>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M docs/user-guide/projects/project-settings.md

  Log Message:
  -----------
  Update the webhook event names (#531)

* Update the webhook event names
* Clarify where and how to trigger the webhooks manually


  Commit: a26470869771319588122d5129ee12312444f592
      
https://github.com/zanata/zanata-platform/commit/a26470869771319588122d5129ee12312444f592
  Author: Ding-Yi Chen <dc...@redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  doc(release): Update docs/release-notes.md for version 4.3.0


  Commit: 0652bb83a1f0580894410032d7f8a852af00ea53
      
https://github.com/zanata/zanata-platform/commit/0652bb83a1f0580894410032d7f8a852af00ea53
  Author: Ding-Yi Chen <dc...@redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): set version 4.3.0-alpha-2


  Commit: d1aad60c33c356ab99609e3536064b68b558952e
      
https://github.com/zanata/zanata-platform/commit/d1aad60c33c356ab99609e3536064b68b558952e
  Author: Ding-Yi Chen <dc...@redhat.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M api/pom.xml
    M api/zanata-common-api/pom.xml
    M build-tools/pom.xml
    M client/pom.xml
    M client/stub-server/pom.xml
    M client/zanata-cli/pom.xml
    M client/zanata-client-commands/pom.xml
    M client/zanata-maven-plugin/pom.xml
    M client/zanata-rest-client/pom.xml
    M common/pom.xml
    M common/zanata-adapter-glossary/pom.xml
    M common/zanata-adapter-po/pom.xml
    M common/zanata-adapter-properties/pom.xml
    M common/zanata-adapter-xliff/pom.xml
    M common/zanata-common-util/pom.xml
    M parent/pom.xml
    M pom.xml
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M server/gwt-shared/pom.xml
    M server/gwt-test/pom.xml
    M server/pom.xml
    M server/security-common/pom.xml
    M server/services/pom.xml
    M server/zanata-frontend/pom.xml
    M server/zanata-liquibase/pom.xml
    M server/zanata-model-test/pom.xml
    M server/zanata-model/pom.xml
    M server/zanata-test-war/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  chore(version): new snapshot version 4.3.0-SNAPSHOT


  Commit: b183ffb69ca49dd7d7a64b5910f79ea0cfc0befd
      
https://github.com/zanata/zanata-platform/commit/b183ffb69ca49dd7d7a64b5910f79ea0cfc0befd
  Author: Alex Eng <a...@redhat.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M docs/release-notes.md
    M server/gwt-editor/pom.xml
    M 
server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java
    M server/zanata-war/pom.xml

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


  Commit: 2c3c8e870548c743a901f3cbb26ffd0fa594aed1
      
https://github.com/zanata/zanata-platform/commit/2c3c8e870548c743a901f3cbb26ffd0fa594aed1
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M .mvn/extensions.xml
    M Jenkinsfile

  Log Message:
  -----------
  Move build timings to CSV file (#523)


  Commit: ada84fdd48c02644a24dc90b7ff9febdd943024b
      
https://github.com/zanata/zanata-platform/commit/ada84fdd48c02644a24dc90b7ff9febdd943024b
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M .mvn/extensions.xml
    M Jenkinsfile

  Log Message:
  -----------
  Merge commit '2c3c8e870548c743a901f3cbb26ffd0fa594aed1' into HEAD


  Commit: ccb4cfe9db86ddc56c1c13c777cf24f4db576f2b
      
https://github.com/zanata/zanata-platform/commit/ccb4cfe9db86ddc56c1c13c777cf24f4db576f2b
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M Jenkinsfile
    M server/functional-test/pom.xml
    M server/pom.xml
    M server/services/src/test/resources/arquillian.xml
    M server/zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Update JVM args (#517)

- Use recommended Java 1.8 (full-speed) debug args, not 1.3
- Use random debug port to avoid conflicts
- Extract server.jvmargs property
- Limit metaspace size, remove obsolete PermGen args
- Enable GC logging
- Archive gc.log/heapdump in subdirs
- Separate archives by appserver


  Commit: ffc86ef76f94e65183a4b843a2c585618fa88b32
      
https://github.com/zanata/zanata-platform/commit/ffc86ef76f94e65183a4b843a2c585618fa88b32
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M Jenkinsfile
    M server/functional-test/pom.xml
    M server/pom.xml
    M server/services/src/test/resources/arquillian.xml
    M server/zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release'


  Commit: 01883e852d78b1d221429f6ff3e50277eada54b8
      
https://github.com/zanata/zanata-platform/commit/01883e852d78b1d221429f6ff3e50277eada54b8
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Changed paths:
    M server/gwt-editor/pom.xml
    M server/pom.xml
    M server/zanata-test-war/pom.xml
    M 
server/zanata-test-war/src/main/java/org/zanata/rest/RemoteTestSignalerImpl.java
    A server/zanata-test-war/src/main/java/org/zanata/test/SessionChecker.kt
    A server/zanata-test-war/src/main/java/org/zanata/test/SessionTracker.kt
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  test: check session size/serializability (#514)

* Check session size/serializability
* Replace kotlin-runtime with kotlin-stdlib


  Commit: 9888c5bc93986ecb8169c658b667189271fda2d5
      
https://github.com/zanata/zanata-platform/commit/9888c5bc93986ecb8169c658b667189271fda2d5
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-09-26 (Tue, 26 Sep 2017)

  Log Message:
  -----------
  Fix test dependency (#535)


  Commit: f45c6ef8fac3264354295be4de44b14ecdce5c05
      
https://github.com/zanata/zanata-platform/commit/f45c6ef8fac3264354295be4de44b14ecdce5c05
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M Jenkinsfile
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockAccountResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockGlossaryResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockProjectIterationResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockProjectResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockProjectsResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockVersionResource.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M 
server/security-common/src/main/java/org/zanata/security/annotations/AuthenticatedLiteral.java
    M server/services/src/main/java/org/zanata/action/ProjectHome.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/dao/GlossaryDAO.java
    M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/services/src/main/java/org/zanata/dao/RequestDAO.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/UserService.java
    M 
server/services/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/services/src/main/java/org/zanata/rest/service/LocalesService.java
    M 
server/services/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M 
server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M 
server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M 
server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M 
server/services/src/main/java/org/zanata/service/impl/SearchServiceImpl.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/zanata-model-test/src/main/java/org/zanata/RestTest.java
    M 
server/zanata-model-test/src/main/java/org/zanata/rest/ResourceRequestEnvironment.java
    M 
server/zanata-model/src/test/java/org/zanata/model/po/HPoTargetHeaderTest.java
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java

  Log Message:
  -----------
  Reduce compiler warnings (#536)


  Commit: cae5f06724f503545db2ee474334b6fdc3eec221
      
https://github.com/zanata/zanata-platform/commit/cae5f06724f503545db2ee474334b6fdc3eec221
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M server/gwt-editor/pom.xml
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  Fix test dependency (#534)


  Commit: 34444e9f1fb9e1d0e2298ff6b9c183098dc99e01
      
https://github.com/zanata/zanata-platform/commit/34444e9f1fb9e1d0e2298ff6b9c183098dc99e01
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Log Message:
  -----------
  Merge commit 'cae5f06724f503545db2ee474334b6fdc3eec221' into HEAD


  Commit: 4efd197b9eab1a6356c011e47daa52a1b119f531
      
https://github.com/zanata/zanata-platform/commit/4efd197b9eab1a6356c011e47daa52a1b119f531
  Author: Sean Flanigan <sflan...@redhat.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M Jenkinsfile
    M server/services/src/main/java/org/zanata/database/ConnectionWrapper.java
    M server/services/src/main/java/org/zanata/database/ProxyUtil.java
    M server/services/src/main/java/org/zanata/database/ResultSetWrapper.java
    M server/services/src/main/java/org/zanata/database/StatementWrapper.java
    M server/services/src/main/java/org/zanata/seam/framework/EntityHome.java
    M 
server/services/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java
    M server/services/src/main/java/org/zanata/seam/text/SeamTextParser.java
    M 
server/services/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M 
server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M 
server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/services/src/main/java/org/zanata/transaction/TransactionUtil.java
    M server/services/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/services/src/test/java/org/zanata/model/CacheReliabilityTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/raw/AnonAccessAlt.java
    M server/services/src/test/java/org/zanata/rest/service/raw/OAuthAlt.java
    M server/services/src/test/java/org/zanata/service/impl/GlossaryUrlTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M 
server/services/src/test/java/org/zanata/transaction/TransactionUtilForUnitTest.java
    M 
server/services/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java

  Log Message:
  -----------
  Reduce compiler warnings (#537)

* Reduce compiler warnings
* Fix generics for ProxyUtil
* Reduce warning count


  Commit: 5d6198207b96e22aa629ac30a5159c7b331a6f64
      
https://github.com/zanata/zanata-platform/commit/5d6198207b96e22aa629ac30a5159c7b331a6f64
  Author: David Mason <drdma...@gmail.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M .mvn/extensions.xml
    M Jenkinsfile
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockStatisticsResource.java
    M 
client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/AsyncProcessClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/CopyTransClient.java
    M 
client/zanata-rest-client/src/main/java/org/zanata/rest/client/StatisticsResourceClient.java
    M 
client/zanata-rest-client/src/test/java/org/zanata/rest/client/StatisticsResourceClientTest.java
    M docs/release-notes.md
    M docs/user-guide/projects/project-settings.md
    M server/functional-test/pom.xml
    M server/gwt-editor/pom.xml
    M 
server/gwt-editor/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M 
server/gwt-shared/src/main/java/org/zanata/webtrans/shared/rest/dto/InternalTMSource.java
    M server/pom.xml
    M 
server/security-common/src/main/java/org/zanata/security/annotations/AuthenticatedLiteral.java
    M server/services/src/main/java/org/zanata/action/ProjectHome.java
    M 
server/services/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M server/services/src/main/java/org/zanata/dao/DocumentDAO.java
    M server/services/src/main/java/org/zanata/dao/GlossaryDAO.java
    M server/services/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M server/services/src/main/java/org/zanata/dao/RequestDAO.java
    M server/services/src/main/java/org/zanata/database/ConnectionWrapper.java
    M server/services/src/main/java/org/zanata/database/ProxyUtil.java
    M server/services/src/main/java/org/zanata/database/ResultSetWrapper.java
    M server/services/src/main/java/org/zanata/database/StatementWrapper.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M 
server/services/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    M 
server/services/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M server/services/src/main/java/org/zanata/rest/service/LocalesService.java
    M 
server/services/src/main/java/org/zanata/rest/service/SourceDocResourceService.java
    M 
server/services/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M 
server/services/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M server/services/src/main/java/org/zanata/seam/framework/EntityHome.java
    M 
server/services/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java
    M server/services/src/main/java/org/zanata/seam/text/SeamTextParser.java
    M server/services/src/main/java/org/zanata/security/ZanataIdentity.java
    M 
server/services/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M 
server/services/src/main/java/org/zanata/service/impl/GlossarySearchServiceImpl.java
    M 
server/services/src/main/java/org/zanata/service/impl/SearchServiceImpl.java
    M 
server/services/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M server/services/src/main/java/org/zanata/transaction/TransactionUtil.java
    M server/services/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M server/services/src/test/java/org/zanata/adapter/JsonAdapterTest.java
    M server/services/src/test/java/org/zanata/adapter/TSAdapterTest.java
    M 
server/services/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java
    M server/services/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M server/services/src/test/java/org/zanata/model/CacheReliabilityTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    M 
server/services/src/test/java/org/zanata/rest/service/raw/AnonAccessAlt.java
    M server/services/src/test/java/org/zanata/rest/service/raw/OAuthAlt.java
    M server/services/src/test/java/org/zanata/service/impl/GlossaryUrlTest.java
    M 
server/services/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M 
server/services/src/test/java/org/zanata/transaction/TransactionUtilForUnitTest.java
    M 
server/services/src/test/java/org/zanata/webtrans/server/rpc/GetGlossaryHandlerJpaTest.java
    M server/services/src/test/resources/arquillian.xml
    M server/zanata-frontend/src/frontend/app/actions/glossary-actions.js
    M server/zanata-frontend/src/frontend/app/styles/style.less
    M server/zanata-model-test/src/main/java/org/zanata/RestTest.java
    M 
server/zanata-model-test/src/main/java/org/zanata/rest/ResourceRequestEnvironment.java
    M 
server/zanata-model-test/src/main/resources/org/zanata/test/model/ApplicationConfigurationData.dbunit.xml
    M 
server/zanata-model/src/test/java/org/zanata/model/po/HPoTargetHeaderTest.java
    M server/zanata-test-war/pom.xml
    M 
server/zanata-test-war/src/main/java/org/zanata/rest/RemoteTestSignalerImpl.java
    A server/zanata-test-war/src/main/java/org/zanata/test/SessionChecker.kt
    A server/zanata-test-war/src/main/java/org/zanata/test/SessionTracker.kt
    M server/zanata-war/pom.xml
    M server/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
    M 
server/zanata-war/src/test/java/org/zanata/rest/service/raw/SourceAndTranslationResourceRestBase.java
    M server/zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge branch 'master' into damason/settings/ZNTA-1927

Conflicts:
        Jenkinsfile
          Number of warnings reduced in both. Used the lower value.

        
client/stub-server/src/main/java/org/zanata/rest/service/MockAsynchronousProcessResource.java
        
client/stub-server/src/main/java/org/zanata/rest/service/MockCopyTransResource.java
        
client/stub-server/src/main/java/org/zanata/rest/service/MockFileResource.java
        
client/stub-server/src/main/java/org/zanata/rest/service/MockSourceDocResource.java
        
client/stub-server/src/main/java/org/zanata/rest/service/MockTranslatedDocResource.java
          These 5 files all had SerialVersionUID removed in both branches, 
causing a false conflict.


Compare: 
https://github.com/zanata/zanata-platform/compare/c36a9a1c0358...5d6198207b96
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to