[ https://issues.apache.org/jira/browse/TRAFODION-1977?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15291701#comment-15291701 ]
ASF GitHub Bot commented on TRAFODION-1977: ------------------------------------------- GitHub user svarnau opened a pull request: https://github.com/apache/incubator-trafodion/pull/493 [TRAFODION-1977] Merge forward release2.0 changes to master Includes all changes from release2.0 branch as of 2.0.0rc3 tag. The major change coming forward is packaging changes associated with TRAFODION-1982. @amandamoran, please check installer changes. You can merge this pull request into a Git repository by running: $ git pull https://github.com/svarnau/incubator-trafodion mrg1977 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-trafodion/pull/493.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 #493 ---- commit 78cb6b85c9b87c1dc17fb18e60edbb8be72e35c6 Author: Anoop Sharma <ansharma@edev06.esgyn.local> Date: 2016-04-26T21:37:55Z Merge PR-451 ddl_transactions turned on by default commit 5dc67545748a9f43d3982e0a975ac1ed51b7ffb4 Author: Dave Birdsall <dbirds...@apache.org> Date: 2016-04-27T15:20:19Z Merge [TRAFODION-1916] PR 449 dcscheck CDH5.4.4 HBase 1.0.0 fix commit 67d3e197f4be877a5206e06326009a0f4681a5a8 Author: Venkat Muthuswamy <venkat.muthusw...@esgyn.com> Date: 2016-04-28T04:47:22Z Fix for JIRA 1953 commit 6e674c65c2a9ebd05c53f8a88b4464601a24808f Author: Prashant Vasudev <prashanth.vasu...@esgyn.com> Date: 2016-04-28T21:12:17Z Fix for TRAFODION-1948 Drop schema cascade internally selects against objects table. The fix is to use a distinct clause in the internal select query. commit ccafdcfca6d54af14971f935eed6efb8f9e36e36 Author: Sandhya Sundaresan <sand...@apache.org> Date: 2016-04-29T05:38:08Z Merge remote branch 'origin/pr/456/head' into merge456 commit 29fb212ddb52fb58a2d6d14087b80834a1eb19c3 Author: Dave Birdsall <dbirds...@apache.org> Date: 2016-04-29T15:40:59Z Merge [TRAFODION-1953] PR 454 Add jetty-security jar to REST server packaging commit ac298d39e93c221fd18ab7377fc830d31dba2659 Author: Prashant Vasudev <prashanth.vasu...@esgyn.com> Date: 2016-05-04T00:15:51Z Fix for TRAFODION-1923 commit af67497157cc5fa0123b63ec499a79640cc4d0f7 Author: selvaganesang <se...@apache.org> Date: 2016-05-04T14:38:26Z Merge Fix for [TRAFODION-1923] PR-463 commit d9890d6eda94d6e2f061e3e0794f28fbea4063b4 Author: Steve Varnau <steve.var...@esgyn.com> Date: 2016-05-04T23:22:50Z [TRAFODION-1972] Remove docs directories from exclude list This will allow these directories to be included in source package, and hence in the official released code. Note that it also includes the website pages, which provides a snapshot in time of the project site, for whatever that is worth. commit dee95868a932834ded7f07ad61cba2e767a4ae13 Author: Steve Varnau <steve.var...@esgyn.com> Date: 2016-05-05T00:58:43Z [TRAFODION-1973] Fix unpacking of hadoop dependencies Issue found while testing build environment setup for release 2.0. Simple fix. commit 84620dffb7dbf5e6df95c0dbb8914e80574572ce Author: Dave Birdsall <dbirds...@apache.org> Date: 2016-05-05T15:29:53Z Merge [TRAFODION-1972] PR 466 Remove docs directories from exclude list commit b3f7856f5e63690f51ded33f11bd87103c8d4e51 Author: Dave Birdsall <dbirds...@apache.org> Date: 2016-05-05T15:34:43Z Merge [TRAFODION-1973] PR 467 Fix unpacking of hadoop dependencies commit e208598d88caab04e14db1dbb38ac5f4378e8826 Author: Amanda Moran <ama...@apache.com> Date: 2016-05-05T17:11:48Z [[TRAFODION-1951]] Fix for JAVA checking commit 7b5e5ea010789a063e40dcb8d7fdcc8d3f6fc704 Author: Steve Varnau <steve.var...@esgyn.com> Date: 2016-05-05T23:20:05Z Merge [TRAFODION-1951] Fix for JAVA checking commit c8ef96457e45441f4853a187237b4149d9058bd5 Author: Steve Varnau <steve.var...@esgyn.com> Date: 2016-05-10T18:03:23Z [TRAFODION-1982] Combine server components into single tar file Now bundle DCS and REST components into server binary tar file. The license & notice file info for REST and DCS are subsumed into server license files. Fix naming of server and client tar files to meet Apache artifact naming practices. commit f716c3f6bc6e04aa9af233e1d6c27dcc0ba65caf Author: Venkat Muthuswamy <venkat.muthusw...@esgyn.com> Date: 2016-05-10T21:29:36Z Merge library management fix from master to R2.0 commit 10adf4b56251543ac73705e3ecc61e1646e37ead Author: Amanda Moran <ama...@apache.com> Date: 2016-05-10T22:49:36Z Fixes for TRAFODION-1985 commit c861ea9e8f34a48056d74ee28a87791168af9c3f Author: Steve Varnau <steve.var...@esgyn.com> Date: 2016-05-10T23:00:52Z Merge remote branch 'amanda/TRAFODION-1985' into pkg1982 commit e3f4cc2667c14b7bc141587d262b1e59f2da3ced Author: Steve Varnau <steve.var...@esgyn.com> Date: 2016-05-10T23:28:58Z [TRAFODION-1982] Tell RAT exclusions about file rename That's what I get for renaming file for clarity from "not-" to "note-" commit 28f51144bdd6d5af68db41a26675e2df32f9500e Author: Amanda Moran <ama...@apache.com> Date: 2016-05-11T13:26:28Z Adding cat of config file for installation debugging commit 42b407c651f76adc29e37eec6eb13ad645d65ba6 Author: Amanda Moran <ama...@apache.com> Date: 2016-05-11T13:32:41Z More debugging commit 8ee3ac0937e04b0641137ef1b09104340b99291b Author: Dave Birdsall <dbirds...@apache.org> Date: 2016-05-11T15:58:07Z Merge PR 475 library management fix into Trafodion Release 2.0 commit 8feea90876355a7d8cdcd85bc59f90c20dd3fc7e Author: Steve Varnau <steve.var...@esgyn.com> Date: 2016-05-11T22:41:18Z Merge [TRAFODION-1982] Package server components into single tar commit 19b8d1f513622fd970efb6edcbe93da833599f7b Author: Amanda Moran <ama...@apache.com> Date: 2016-05-12T16:56:05Z Merge branch 'release2.0' of github.com:apache/incubator-trafodion into TRAFODION-1985 commit 95c553a91772f4a8908655887ede11c539c6ed7c Author: Amanda Moran <ama...@apache.com> Date: 2016-05-13T19:14:03Z TRAFODION-1993 Expand DCS and REST directories commit 1e1dca8c0a5ac2413cfaa07fb6cdd5bce8a7c0c3 Author: Amanda Moran <ama...@apache.com> Date: 2016-05-13T19:15:53Z Printing path commit 55093a157338ecef73e038267cb1b9e9d8f4b4f8 Author: Steve Varnau <steve.var...@esgyn.com> Date: 2016-05-13T20:34:10Z [TRAFODION-1992] Re-packaging server tar file broke install_traf_components Change install_traf_components to use built target directory instead of tar file, now that tar file is not produced for DCS and REST. commit 15fbc0ba54d8fc000d1ab5fc77c151df8911e608 Author: Amanda Moran <ama...@apache.com> Date: 2016-05-13T20:45:54Z Typo commit 0205fcef88c30a6a42bdc4dd2cb3f040b2ab17f6 Author: Amanda Moran <ama...@apache.com> Date: 2016-05-13T21:37:02Z Merge error for JAVA check! commit c0552b02c30e4da6aa419fbc76e763a3d62b0a3e Author: Amanda Moran <ama...@apache.com> Date: 2016-05-13T21:55:52Z removing sudo ---- > 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)