Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-hawq


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/ce3f7c6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/ce3f7c6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/ce3f7c6b

Branch: refs/heads/HAWQ-543
Commit: ce3f7c6b5c0315b97298d651f5d5f7383000491a
Parents: 8086a24 36b2a0f
Author: Shivram Mani <shivram.m...@gmail.com>
Authored: Fri Jun 24 15:15:25 2016 -0700
Committer: Shivram Mani <shivram.m...@gmail.com>
Committed: Fri Jun 24 15:15:25 2016 -0700

----------------------------------------------------------------------
 depends/thirdparty/gporca                       |    2 +-
 depends/thirdparty/gpos                         |    2 +-
 depends/thirdparty/postgres                     |    2 +-
 src/backend/access/appendonly/aosegfiles.c      |    6 +-
 src/backend/access/nbtree/nbtxlog.c             |   10 +
 src/backend/access/transam/xlog.c               |    6 +
 src/backend/gpopt/CGPOptimizer.cpp              |   67 +-
 src/backend/gpopt/ivy.xml                       |    4 +-
 src/backend/optimizer/plan/planner.c            |  133 ++
 .../resourcemanager/include/resourcepool.h      |    2 +-
 src/backend/resourcemanager/resourcemanager.c   |    2 +-
 src/backend/resourcemanager/resourcepool.c      |    6 +-
 src/backend/utils/init/postinit.c               |   14 +
 src/include/gpopt/CGPOptimizer.h                |    7 +
 src/include/optimizer/planner.h                 |    5 +
 tools/bin/Makefile                              |    2 +-
 tools/bin/pythonSrc/pycrypto-2.0.1/ACKS         |   34 +
 tools/bin/pythonSrc/pycrypto-2.0.1/ChangeLog    |  316 ++++
 .../pythonSrc/pycrypto-2.0.1/Cipher/__init__.py |   33 +
 .../pythonSrc/pycrypto-2.0.1/Doc/pycrypt.tex    | 1188 ++++++++++++++
 tools/bin/pythonSrc/pycrypto-2.0.1/Hash/HMAC.py |  108 ++
 tools/bin/pythonSrc/pycrypto-2.0.1/Hash/MD5.py  |   13 +
 tools/bin/pythonSrc/pycrypto-2.0.1/Hash/SHA.py  |   11 +
 .../pythonSrc/pycrypto-2.0.1/Hash/__init__.py   |   24 +
 tools/bin/pythonSrc/pycrypto-2.0.1/LICENSE      |   15 +
 tools/bin/pythonSrc/pycrypto-2.0.1/MANIFEST     |   63 +
 tools/bin/pythonSrc/pycrypto-2.0.1/PKG-INFO     |   18 +
 .../pycrypto-2.0.1/Protocol/AllOrNothing.py     |  295 ++++
 .../pycrypto-2.0.1/Protocol/Chaffing.py         |  229 +++
 .../pycrypto-2.0.1/Protocol/__init__.py         |   17 +
 .../pythonSrc/pycrypto-2.0.1/PublicKey/DSA.py   |  238 +++
 .../pycrypto-2.0.1/PublicKey/ElGamal.py         |  132 ++
 .../pythonSrc/pycrypto-2.0.1/PublicKey/RSA.py   |  256 +++
 .../pycrypto-2.0.1/PublicKey/__init__.py        |   17 +
 .../pycrypto-2.0.1/PublicKey/pubkey.py          |  172 +++
 .../pythonSrc/pycrypto-2.0.1/PublicKey/qNEW.py  |  170 ++
 .../pycrypto-2.0.1/PublicKey/test/rsa_speed.py  |   48 +
 tools/bin/pythonSrc/pycrypto-2.0.1/README       |   76 +
 tools/bin/pythonSrc/pycrypto-2.0.1/TODO         |   31 +
 .../pythonSrc/pycrypto-2.0.1/Util/RFC1751.py    |  342 ++++
 .../pythonSrc/pycrypto-2.0.1/Util/__init__.py   |   16 +
 .../bin/pythonSrc/pycrypto-2.0.1/Util/number.py |  201 +++
 .../pythonSrc/pycrypto-2.0.1/Util/randpool.py   |  421 +++++
 tools/bin/pythonSrc/pycrypto-2.0.1/Util/test.py |  453 ++++++
 .../pycrypto-2.0.1/Util/test/prime_speed.py     |   24 +
 tools/bin/pythonSrc/pycrypto-2.0.1/__init__.py  |   25 +
 tools/bin/pythonSrc/pycrypto-2.0.1/setup.py     |  168 ++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/AES.c    | 1459 ++++++++++++++++++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/ARC2.c   |  185 +++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/ARC4.c   |   72 +
 .../bin/pythonSrc/pycrypto-2.0.1/src/Blowfish.c |  499 ++++++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/CAST.c   |  436 ++++++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/DES.c    |  665 ++++++++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/DES3.c   |  688 +++++++++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/IDEA.c   |  196 +++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/MD2.c    |  118 ++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/MD4.c    |  203 +++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/RC5.c    |  212 +++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/RIPEMD.c |  507 ++++++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/SHA256.c |  200 +++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/XOR.c    |   52 +
 tools/bin/pythonSrc/pycrypto-2.0.1/src/_dsa.c   |  331 ++++
 .../pythonSrc/pycrypto-2.0.1/src/_fastmath.c    |  804 ++++++++++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/_rsa.c   |  346 +++++
 .../pycrypto-2.0.1/src/block_template.c         |  753 +++++++++
 tools/bin/pythonSrc/pycrypto-2.0.1/src/cast5.c  |  437 ++++++
 .../pycrypto-2.0.1/src/hash_template.c          |  248 +++
 .../pycrypto-2.0.1/src/stream_template.c        |  248 +++
 .../bin/pythonSrc/pycrypto-2.0.1/src/winrand.c  |  366 +++++
 tools/bin/pythonSrc/pycrypto-2.0.1/test.py      |   38 +
 .../bin/pythonSrc/pycrypto-2.0.1/test/template  |   26 +
 .../pycrypto-2.0.1/test/test_chaffing.py        |   58 +
 .../pycrypto-2.0.1/test/test_hashes.py          |   94 ++
 .../pycrypto-2.0.1/test/test_number.py          |   85 +
 .../pycrypto-2.0.1/test/test_publickey.py       |  122 ++
 .../pycrypto-2.0.1/test/test_randpool.py        |   48 +
 .../pycrypto-2.0.1/test/test_rfc1751.py         |   45 +
 .../pythonSrc/pycrypto-2.0.1/test/testdata.py   |  681 ++++++++
 78 files changed, 15633 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


Reply via email to