You are viewing a plain text version of this content. The canonical link for it is here.
Posted to codereview@trafodion.apache.org by sandhyasun <gi...@git.apache.org> on 2017/05/08 20:38:44 UTC

[GitHub] incubator-trafodion pull request #1085: Merge release 2.1 branch into master...

GitHub user sandhyasun opened a pull request:

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

    Merge release 2.1 branch into master branch

    

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

    $ git pull https://github.com/sandhyasun/incubator-trafodion merge2.1

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

    https://github.com/apache/incubator-trafodion/pull/1085.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 #1085
    
----
commit 1ce7665ed41e8ceb01efa8761f1d76d06d4c487c
Author: Steve Varnau <sv...@apache.org>
Date:   2017-02-21T23:07:54Z

    [TRAFODION-2481] Improve ambari section of provisioning guide
    
    Add small screen caps to better illustrate ambari integration.
    
    Fix a couple of typos in project-name macros, thanks to Anuradha's review.
    
    Fix a bug in the ambari integration code, found by exercising steps in
    the doc.

commit 34715ee8b249ed64ab58f3cac67896617ac91c0f
Author: Steve Varnau <sv...@apache.org>
Date:   2017-02-22T16:19:06Z

    [TRAFODION-2481] Add section on initializing meta-data via Ambari

commit dc58c85d3b0c7364461129ac7973c5f97b6576a8
Author: Eason <hf...@gmail.com>
Date:   2017-02-23T08:04:48Z

    [TRAFODION-2496] pyinstaller - better handle constants

commit 3e0d531abce2361e855e0376aba3bb6ae4eaa04a
Author: Suresh Subbiah <su...@apache.org>
Date:   2017-02-23T16:54:19Z

    Merge [TRAFODION-2481] PR-974 Improve ambari section of provisioning guide

commit 92c80fd3750d7b90b147c62aa095b6d63ecf4a50
Author: Eason <hf...@gmail.com>
Date:   2017-02-24T04:52:46Z

    [TRAFODION-2482] documentation for python installer

commit 476519d2b983c22a8d0d56998e5fd14ddf83a8c8
Author: Eason <hf...@gmail.com>
Date:   2017-02-27T02:14:59Z

    [TRAFODION-2510] pyinstaller - remove DB__ADMIN from installer

commit 6ac51cae347bb3350021f1a663176cf994fb94e6
Author: Sandhya Sundaresan <sa...@apache.org>
Date:   2017-02-27T18:27:44Z

    Reverting minor version back to 1

commit ff8a1214aa2b2a5c05b69f9f021f2fe94c12a9af
Author: Sandhya Sundaresan <sa...@apache.org>
Date:   2017-02-27T21:57:13Z

    Merge PR 981

commit 6cc89578a038fcbcf24319ac07ca96f2e38ffaa4
Author: Sandhya Sundaresan <sa...@apache.org>
Date:   2017-03-02T00:18:24Z

    Merge Trafodion 2477 to 2.1

commit 58caf9fd361afd9d1bae61865032acbc0b8bd3b3
Author: Sandhya Sundaresan <sa...@apache.org>
Date:   2017-03-02T00:24:38Z

    Merge Trafodion 2496 to 2.1

commit b02f1973dfeb1a022a149795bda94196eb64d617
Author: Sandhya Sundaresan <sa...@apache.org>
Date:   2017-03-03T07:48:02Z

    Python documentation TRAFODION-2482 to 2.1

commit c00c034eb75aa3d78d8aa94a861b48f03c2b2db3
Author: selvaganesang <se...@esgyn.com>
Date:   2017-03-01T17:56:35Z

    [TRAFODION-2514] Obscure cores seen in Trafodion while running jenkins tests with RH7
    
    The global object gv_sb_thread_table was not constructed in a
    thread safe manner.
    
    There was buffer overrun while creating explain fragment involving hive tables.

commit dc6e7bd4081cdf885cba3708c9d7cf727515a6c4
Author: Eason <hf...@gmail.com>
Date:   2017-03-06T16:28:09Z

    [TRAFODION-2518] pyinstaller - remove unused db_admin settings.

commit 6c4c36632e3437219e99383775fb2a05e7954424
Author: Suresh Subbiah <su...@apache.org>
Date:   2017-03-06T21:12:14Z

    [TRAFODION-2514] Obscure cores seen in Trafodion while running jenkins

commit a3976079413308e654dc553a28e83d2227ce74ca
Author: Sandhya Sundaresan <sa...@apache.org>
Date:   2017-03-06T22:54:53Z

    Year change for banner

commit 079f1cea96866beb95417325a560952a74f7bb33
Author: Eason <hf...@gmail.com>
Date:   2017-03-07T03:21:23Z

    optimize ps command in uninstall script

commit 3eddda43d48c21c0cc05109c26b500e3336cd831
Author: Sandhya Sundaresan <sa...@apache.org>
Date:   2017-03-07T05:26:52Z

     Merge copyright header

commit d7c8adfaa3fde527f586bd826c2cd438e19174ee
Author: kevinxu021 <ka...@esgyn.cn>
Date:   2017-03-07T10:24:35Z

    As debugged by Arvind: Increase size of the buffer that reads cmdline arg
    
    Conflicts:
    
    	core/sql/cli/CliExtern.cpp

commit ba33ebb2fda6076d6eeb8510322eb135a4cbf253
Author: Roberta Marton <rm...@edev07.esgyn.local>
Date:   2017-03-08T01:01:28Z

    Fix regression failures for privs1 and privs2

commit 8a3cfd6fecdc86ed59e6968dcfab6398398f316a
Author: Arvind Narain <ar...@esgyn.com>
Date:   2016-08-06T01:09:01Z

    Handle unsafe sprintf call causing DCS Master to core on Centos 7.x

commit 39251ff64c6267d6aea40d6943c84428136349c5
Author: liu.yu <yu...@esgyn.cn>
Date:   2017-03-06T09:26:27Z

    OLAP functions

commit db18be9f3742f26ab25f3c6ce2cb5cc5bba23ac4
Author: liu.yu <yu...@esgyn.cn>
Date:   2017-03-07T06:34:50Z

    OLAP Functions 2

commit 8b9b21425f55fa2929d5d2f79b67a9fe04865f38
Author: Eason <hf...@gmail.com>
Date:   2017-03-08T02:28:34Z

    [TRAFODION-2525] pyinstaller - support HBase1.2 version in config file

commit 74a86b9c2818ea2ad4068ec8e75a8cd969bfa5d8
Author: Hans Zeller <hz...@apache.org>
Date:   2017-03-08T17:03:52Z

    Merge Cherry-pick two documentation changes from 2.2 into 2.1 PR-998

commit 4e8dd59b0f66e9c604a661c529b0bbce36c3775f
Author: Dave Birdsall <db...@apache.org>
Date:   2017-03-08T19:16:12Z

    Merge [TRAFODION-2524] Increase cmdline buffer size

commit 4348ce699c8f4914d93846f699690383d7eb724d
Author: Dave Birdsall <db...@apache.org>
Date:   2017-03-08T19:21:52Z

    Merge [TRAFODION-2518] Remove unused db_admin settings from pyinstaller

commit b347946df9603a2e91b78d1a08678a3873299247
Author: Roberta Marton <rm...@edev07.esgyn.local>
Date:   2017-03-08T21:05:27Z

    Merge privs1 and privs2 regress fix pr 997

commit 29c08ed044e89f717d48882af0fd982856ac1f4c
Author: Dave Birdsall <db...@apache.org>
Date:   2017-03-09T17:28:24Z

    Merge [TRAFODION-2525] PR 999 Add HBase1.2 version to pyinstaller config file

commit 108530796f9d6af1d48763a729dabe629146a8c7
Author: Sandhya Sundaresan <sa...@apache.org>
Date:   2017-03-09T22:18:17Z

    Change file location of Hadoop hdfs jar file

commit e48a2be709956e25f3ccc9865c5a789eb5714f93
Author: Sandhya Sundaresan <sa...@apache.org>
Date:   2017-03-10T02:27:29Z

    Merge [TRAFODION-2528] classpath change

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-trafodion pull request #1085: Merge release 2.1 branch into master...

Posted by zellerh <gi...@git.apache.org>.
Github user zellerh commented on a diff in the pull request:

    https://github.com/apache/incubator-trafodion/pull/1085#discussion_r115386413
  
    --- Diff: install/python-installer/scripts/copy_files.py ---
    @@ -37,7 +37,7 @@ def run(user, pwd):
         hosts = dbcfgs['node_list'].split(',')
         traf_package = dbcfgs['traf_package']
     
    -    sudo_prefix = get_sudo_prefix()
    +    udo_prefix = get_sudo_prefix()
    --- End diff --
    
    Is the "s" here accidentally deleted?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-trafodion pull request #1085: Merge release 2.1 branch into master...

Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:

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


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-trafodion pull request #1085: Merge release 2.1 branch into master...

Posted by sandhyasun <gi...@git.apache.org>.
Github user sandhyasun commented on a diff in the pull request:

    https://github.com/apache/incubator-trafodion/pull/1085#discussion_r115402702
  
    --- Diff: install/python-installer/scripts/copy_files.py ---
    @@ -37,7 +37,7 @@ def run(user, pwd):
         hosts = dbcfgs['node_list'].split(',')
         traf_package = dbcfgs['traf_package']
     
    -    sudo_prefix = get_sudo_prefix()
    +    udo_prefix = get_sudo_prefix()
    --- End diff --
    
    Yes ! It had to be manually resolved so got removed I guess. 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-trafodion pull request #1085: Merge release 2.1 branch into master...

Posted by sandhyasun <gi...@git.apache.org>.
Github user sandhyasun commented on a diff in the pull request:

    https://github.com/apache/incubator-trafodion/pull/1085#discussion_r115354022
  
    --- Diff: core/sqf/sqenvcom.sh ---
    @@ -32,12 +32,12 @@
     #Product version (Trafodion or derivative product)
     export TRAFODION_VER_PROD="Apache Trafodion"
     export TRAFODION_VER_MAJOR=2
    -export TRAFODION_VER_MINOR=2
    +export TRAFODION_VER_MINOR=1
     export TRAFODION_VER_UPDATE=0
    --- End diff --
    
    Oops...need to correct this. Incorrect merge. 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-trafodion pull request #1085: Merge release 2.1 branch into master...

Posted by svarnau <gi...@git.apache.org>.
Github user svarnau commented on a diff in the pull request:

    https://github.com/apache/incubator-trafodion/pull/1085#discussion_r115348234
  
    --- Diff: core/sqf/sqenvcom.sh ---
    @@ -32,12 +32,12 @@
     #Product version (Trafodion or derivative product)
     export TRAFODION_VER_PROD="Apache Trafodion"
     export TRAFODION_VER_MAJOR=2
    -export TRAFODION_VER_MINOR=2
    +export TRAFODION_VER_MINOR=1
     export TRAFODION_VER_UPDATE=0
    --- End diff --
    
    This is an error to revert release back to 2.1


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---