[
https://issues.apache.org/jira/browse/TRAFODION-1977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15383174#comment-15383174
]
ASF GitHub Bot commented on TRAFODION-1977:
-------------------------------------------
GitHub user svarnau opened a pull request:
https://github.com/apache/incubator-trafodion/pull/603
[TRAFODION-1977] Merge forward release2.0 changes to master
Final changes for 2.0.1 release merged forward.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/svarnau/incubator-trafodion mrg_201_0718
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-trafodion/pull/603.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 #603
----
commit 3b9be91867c645ab070eeb59b301f8fd7983c05e
Author: Roberta Marton <rmarton@edev07.esgyn.local>
Date: 2016-06-21T17:34:36Z
Fixes for TRAFODION-2068 and TRAFODION-2082
TRAFODION-2068: Missing DISCLAIMER files for release package
TRAFODION-2082: BSD-4 license for swsprintf and swscanf unclear
Added DISCLAIMER file to clients and installer packages
Updated BSD license text in swsprintf.cpp and swscanf.cpp
commit 0e160222c3119399bd8019d39bea2c5b67c791a3
Author: Dave Birdsall <dbirds...@apache.org>
Date: 2016-06-21T22:46:24Z
Merge [TRAFODION-2068] [TRAFODION-2082] PR 554 License and disclaimer files
commit 649561964565e1d6896d2e584754b1c757a0fd01
Author: Roberta Marton <rmarton@edev07.esgyn.local>
Date: 2016-06-22T23:00:41Z
Fixes for TRAFODION-2068
TRAFODION-2068: Missing DISCLAIMER files for release package
Added DISCLAIMER file to servers package.
commit 0024320349d3b1387e27ba6b54c1871348dc6ec2
Author: Roberta Marton <rmarton@edev07.esgyn.local>
Date: 2016-06-23T00:55:18Z
Fixes for TRAFODION-2068
TRAFODION-2068: Missing DISCLAIMER files for release package
Added DISCLAIMER file to servers package.
commit 07b78449d3dbe76f2dd4ac273b0fe740bc8b5f90
Author: Roberta Marton <rmarton@edev07.esgyn.local>
Date: 2016-06-23T03:03:50Z
Added DISCLAIMER filel to rat-excludes, does not have an Apache header
commit b7dc6414b9e23cbd8ab7d5e97106900615b5de87
Author: Roberta Marton <rmarton@edev07.esgyn.local>
Date: 2016-06-23T17:01:51Z
Added DISCLAIMER file to sqf/.gitignore file since this file is not
tracked by git. Also reverted last changed, .rat-excludes does not need
to be changed to support DISCLAIMER file. The rat tool has support to
handle these types of mandatory files.
commit 2935d41cbdb1e9708440fe6e64f200de2edfbc1b
Author: Roberta Marton <rmarton@edev07.esgyn.local>
Date: 2016-06-23T18:08:28Z
Added sqf/DISCLAIMER to the .gitignore file also.
commit 6357cb8f76ab399b451896c75273fd6f2e02d9c4
Author: Roberta Marton <roberta.mar...@apache.org>
Date: 2016-06-23T22:49:34Z
Merge [TRAFODION-2068] pr #557 Missing DISCLAIMER files for release package
commit 026aefe61823aedad94c183bb306b0f5879dcd3b
Author: Steve Varnau <steve.var...@esgyn.com>
Date: 2016-07-08T17:23:24Z
[TRAFODION-2092] (Backport to release2.0) Fix installer package name
This is a backport of Anu's changes and mine from master to generate
installer package from the main makefile and name the package correctly.
Also includes the license typo mentioned in TRAFODION-2093.
These changes are backported in case any more patch releases are needed
for 2.0.x.
commit 30f41890844bf444817b6a5d4b9f35e2ae64342f
Author: Dave Birdsall <dbirds...@apache.org>
Date: 2016-07-12T18:23:23Z
Merge [TRAFODION-2092][TRAFODION-2093] PR 587 Fix installer package name
commit a7b4a70171f12f1bacca8731ebc9a38dfff73923
Author: Steve Varnau <steve.var...@esgyn.com>
Date: 2016-07-18T22:05:01Z
[TRAFODION-1977] Merge forward 2.0.1 RC3 changes.
----
> 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)
