[ 
https://issues.apache.org/jira/browse/TRAFODION-1977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15321093#comment-15321093
 ] 

ASF GitHub Bot commented on TRAFODION-1977:
-------------------------------------------

GitHub user svarnau opened a pull request:

    https://github.com/apache/incubator-trafodion/pull/531

    [TRAFODION-1977] Merge forward release2.0 changes to master

    Merge 2.0.1 RC1 fixes forward to master
    This now includes
        TRAFODION-2023 Clarify License Text
        TRAFODION-2024 Dynamically link SSL libraries
    


You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/svarnau/incubator-trafodion mrg_rel201rc1

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-trafodion/pull/531.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #531
    
----
commit a45063a45082674224c074199d23838f96b0a40b
Author: Steve Varnau <steve.var...@esgyn.com>
Date:   2016-06-01T21:43:38Z

    [TRAFODION-2023] Clarify license text
    
    Fix issues found in review of release 2.0.0.
    
    Clarify that BSD-4 license has a rescinded clause.
    
    Remove the GPL text of two packages that have dual license, since we are
    not redistributing under GPL.

commit 0a8507aaf680216f09340110fae857b402f303ce
Author: Steve Varnau <steve.var...@esgyn.com>
Date:   2016-06-01T21:51:07Z

    Clarify how to run RAT, per comments from release 2.0.0 review.

commit 4c49f6f69ff1b10a70134bd25301447fc5a7c0d9
Author: Dave Birdsall <dbirds...@apache.org>
Date:   2016-06-02T18:20:33Z

    Merge [TRAFODION-2023] PR 515 Clarify license text

commit f7c2c1e08895c3ad960626a1eb46f5cf2061a4d5
Author: Anuradha Hegde <anuradha.he...@esgyn.com>
Date:   2016-06-04T13:32:28Z

    Openssl libraries (ssl & crypto) are linked dynamically

commit e18b447c625a7b7ead8a78a93de3a630b45af5cb
Author: Dave Birdsall <dbirds...@apache.org>
Date:   2016-06-06T16:10:02Z

    Merge [TRAFODION-2024] PR 522 Change Openssl library linkage to dynamic

commit e3755ec2cdc233930a3cbe199f6a1d618098d6f8
Author: Steve Varnau <steve.var...@esgyn.com>
Date:   2016-06-06T16:41:39Z

    Bump Release number to 2.0.1
    
    Patch release for linking SSL libraries.

commit 5943646e38861d4fceb92a5be314a440b4528aff
Author: Steve Varnau <steve.var...@esgyn.com>
Date:   2016-06-06T19:12:41Z

    Release version change - fix core regression
    
    Backport from master branch. Same fix was needed when release version
    changed there.

commit 355bb687b70acd0aba78b4436fd7bdf11dd8c9ed
Author: Dave Birdsall <dbirds...@apache.org>
Date:   2016-06-07T00:26:28Z

    Merge PR 524 Bump release number to 2.0.1

commit 4ce086c1be09ca8d6d111a13541cadc71f4da4d2
Author: Steve Varnau <steve.var...@esgyn.com>
Date:   2016-06-08T17:59:52Z

    [TRAFODION-1977] Merge 2.0.1 RC1 fixes forward to master
    
    Merging all release2.0 branch fixes forward. This now includes
    TRAFODION-2023 Clarify License Text
    TRAFODION-2024 Dynamically link SSL libraries

----


> Merge 2.0 fixes forward to master branch
> ----------------------------------------
>
>                 Key: TRAFODION-1977
>                 URL: https://issues.apache.org/jira/browse/TRAFODION-1977
>             Project: Apache Trafodion
>          Issue Type: Bug
>    Affects Versions: 2.1-incubating
>            Reporter: Steve Varnau
>            Assignee: Steve Varnau
>




--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Reply via email to