Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge cascading3 to develop #1586

Open
wants to merge 105 commits into
base: develop
Choose a base branch
from
Open

Merge cascading3 to develop #1586

wants to merge 105 commits into from

Commits on May 14, 2015

  1. Prepare for release of 0.14.0

    Joe Nievelt committed May 14, 2015
    Configuration menu
    Copy the full SHA
    e90edc1 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2015

  1. Merge branch 'release/0.14.0'

    Joe Nievelt committed May 15, 2015
    Configuration menu
    Copy the full SHA
    ca905a2 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2015

  1. Merge branch 'release/0.15.0'

    Katya Gonina committed May 21, 2015
    Configuration menu
    Copy the full SHA
    afbde5a View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' of github.com:twitter/scalding

    Conflicts:
    	CHANGES.md
    	README.md
    	project/Build.scala
    	scalding-core/src/main/scala/com/twitter/package.scala
    	tutorial/execution-tutorial/ExecutionTutorial.scala
    	version.sbt
    Katya Gonina committed May 21, 2015
    Configuration menu
    Copy the full SHA
    ece459a View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2016

  1. Configuration menu
    Copy the full SHA
    0f9bdc9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cba13d1 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2016

  1. Merge pull request #1488 from rubanm/rubanm/drop_parquet_cascading

    Remove dependency on parquet-cascading
    ianoc authored and rubanm committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    2d5aa36 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2016

  1. Merge pull request #1491 from twitter/oscar/updatebuild

    Update the build
    johnynek authored and rubanm committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    d336e3c View commit details
    Browse the repository at this point in the history
  2. Temporarily revert dep vesion bumps to match what is in use at Twitte…

    …r internally. This will be updated as part of the eventual merge to develop.
    rubanm committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    3e5db6f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    10b8b5a View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1515 from twitter/rubanm/cascading3/parquet_subpr…

    …ojects
    
    [cascading3] Move parquet cascading schemes to subprojects
    rubanm committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    61666fa View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8ad9b1f View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2016

  1. Configuration menu
    Copy the full SHA
    a107a76 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d5f3aa9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dbf6595 View commit details
    Browse the repository at this point in the history
  4. [cascading3] Migrate maple

    rubanm committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    5d8666b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2c47b2e View commit details
    Browse the repository at this point in the history
  6. Merge pull request #1516 from twitter/rubanm/cascading3/parquet_schemes

    [cascading3] Migrate parquet schemes
    rubanm committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    0269e6b View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1519 from twitter/rubanm/cascading3/maple

    [cascading3] Migrate maple
    rubanm committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    9229e52 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2016

  1. Configuration menu
    Copy the full SHA
    15cee63 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1a98243 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2016

  1. Configuration menu
    Copy the full SHA
    b29a6c8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a5d60bf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3cf03b0 View commit details
    Browse the repository at this point in the history
  4. [cascading3] Review comments

    rubanm committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    b877f5c View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2016

  1. Configuration menu
    Copy the full SHA
    2abe899 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2016

  1. Configuration menu
    Copy the full SHA
    8f5aa17 View commit details
    Browse the repository at this point in the history
  2. Utility for expanding libjars

    Hadoop's -libjars doesn't support wildcards, with large class paths its easy to exhaust the max arg length for linux/os x when running commands. This acts as a filter above our interaction with the generic options parser to expand wildcards
    ianoc authored and rubanm committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    dcc5ea5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c85b099 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2016

  1. Configuration menu
    Copy the full SHA
    275bdf3 View commit details
    Browse the repository at this point in the history
  2. [cascading3] Fix VersionedTap

    rubanm committed Apr 8, 2016
    Configuration menu
    Copy the full SHA
    ed5b95d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    47e852e View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2016

  1. Merge pull request #1521 from twitter/rubanm/cascading3/core

    [cascading3] Migrate core, commons and related
    rubanm committed Apr 13, 2016
    Configuration menu
    Copy the full SHA
    28daec9 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2016

  1. Configuration menu
    Copy the full SHA
    c4fa280 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    81f6ac1 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2016

  1. Configuration menu
    Copy the full SHA
    900dee3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4554b06 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    22266bb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a764128 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2016

  1. Configuration menu
    Copy the full SHA
    9cd14b0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    749b626 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2016

  1. Configuration menu
    Copy the full SHA
    ca184e2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fb0e4de View commit details
    Browse the repository at this point in the history

Commits on May 9, 2016

  1. Merge pull request #1557 from twitter/rubanm/cascading3/hashjoin_merge

    [cascading3] Adds a checkpoint when hashjoin is merged with one of its sides
    rubanm committed May 9, 2016
    Configuration menu
    Copy the full SHA
    cb04163 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2016

  1. Configuration menu
    Copy the full SHA
    f5a2b12 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2016

  1. Configuration menu
    Copy the full SHA
    1fabd1a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a4cb491 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2016

  1. Merge pull request #1568 from twitter/rubanm/cascading3/union_fix

    [cascading3] Bump to 3.1.1-wip61, add platform test
    rubanm committed Jun 10, 2016
    Configuration menu
    Copy the full SHA
    c21f7ed View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2016

  1. Merge tag 'v0.16.1-RC1' into cascading3

    Releasing 0.16.1-RC1
    rubanm committed Jun 21, 2016
    Configuration menu
    Copy the full SHA
    2030813 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0d407fb View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2016

  1. Setting version to 0.16.1-RC3

    rubanm committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    f37a131 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2016

  1. Merge tag 'v0.16.1-RC3' into cascading3

    Releasing 0.16.1-RC3
    rubanm committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    750511c View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2016

  1. Configuration menu
    Copy the full SHA
    2840210 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    220497b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    52cbc40 View commit details
    Browse the repository at this point in the history
  4. fix missing end line

    rubanm committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    6c97a32 View commit details
    Browse the repository at this point in the history
  5. Revert "fix missing end line"

    This reverts commit 6c97a32.
    rubanm committed Jul 20, 2016
    Configuration menu
    Copy the full SHA
    59a1abc View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2016

  1. Configuration menu
    Copy the full SHA
    07befcb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    48d22b5 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2016

  1. Configuration menu
    Copy the full SHA
    e882e89 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2016

  1. Configuration menu
    Copy the full SHA
    250fb42 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2016

  1. Switch Cascading version to 3.2-wip4

    Piyush Narang committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    1a2d2e4 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2016

  1. Update hadoop version to match cascading

    Piyush Narang committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    7346a55 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2016

  1. Switch to hadoop 2.6.0

    Piyush Narang committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    7bd7017 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bed0c10 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1592 from piyushnarang/bump-cascading

    Bump cascading3 version to pick up hashJoin distcache update
    Piyush Narang committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    90bcf73 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'develop' into cascading3

    Piyush Narang committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    67ed79b View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1596 from piyushnarang/piyush/cascading3

    Merge develop into cascading3
    Piyush Narang committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    3760278 View commit details
    Browse the repository at this point in the history
  6. Setting version to 0.16.1-cascading3-RC3

    Piyush Narang committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    477ffc5 View commit details
    Browse the repository at this point in the history
  7. Setting version to 0.16.1-SNAPSHOT

    Piyush Narang committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    0ceb9fd View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2016

  1. Configuration menu
    Copy the full SHA
    45db1e0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cc1c2d8 View commit details
    Browse the repository at this point in the history
  3. Make case check explicit

    Piyush Narang committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    5fa1c50 View commit details
    Browse the repository at this point in the history
  4. Remove unnecessary implicitly calls

    Piyush Narang committed Sep 27, 2016
    Configuration menu
    Copy the full SHA
    3cbe7fa View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2016

  1. Merge pull request #1600 from piyushnarang/update-versionkvstore

    [cascading3] Fix VersionedKeyValueStore bug when used with specific version
    Piyush Narang committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    eca8410 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2016

  1. Merge branch 'develop' into cascading3

    Piyush Narang committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    f3c69d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2016

  1. Configuration menu
    Copy the full SHA
    954adb6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1606 from twitter/piyush/cascading3

    Refresh cascading3 branch with latest changes in develop
    Piyush Narang committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    1cb2a77 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2016

  1. Update cascading3 release + add regression test

    Piyush Narang committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    d99c213 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1607 from piyushnarang/grpby-triangle

    Bump Cascading3 version + add regression test
    Piyush Narang committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    ccef55a View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2016

  1. Configuration menu
    Copy the full SHA
    f31c612 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2016

  1. Avoid sending a tree of multiple nested cascading.Merge when merging …

    …multiple inputs (#1605)
    cchepelov authored and johnynek committed Oct 27, 2016
    Configuration menu
    Copy the full SHA
    dcc736f View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2016

  1. Merge branch 'develop' into cascading3

    Piyush Narang committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    9a8e3ff View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1620 from piyushnarang/cascading3

    Merge develop -> cascading3
    Piyush Narang committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    bb7e48c View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2017

  1. Configuration menu
    Copy the full SHA
    2f99c39 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    12a5325 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2017

  1. Configuration menu
    Copy the full SHA
    c87c0b5 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2018

  1. Configuration menu
    Copy the full SHA
    ee5f699 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    41fbdb1 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2018

  1. Configuration menu
    Copy the full SHA
    398878f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c4723c1 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2018

  1. Use getOrdinal

    piyushnarang committed Jan 17, 2018
    Configuration menu
    Copy the full SHA
    5bc26fd View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2018

  1. Configuration menu
    Copy the full SHA
    4e64cb5 View commit details
    Browse the repository at this point in the history
  2. Scala formatting fixes

    piyushnarang committed Jan 18, 2018
    Configuration menu
    Copy the full SHA
    cc7f249 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2018

  1. Configuration menu
    Copy the full SHA
    5f1987e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e24fd40 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. Configuration menu
    Copy the full SHA
    3c350b9 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2018

  1. Merge pull request #1762 from piyushnarang/cascading3

    Merge develop into cascading3
    johnynek committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    a01c942 View commit details
    Browse the repository at this point in the history
  2. use https for twttr maven

    johnynek committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    052310f View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1767 from twitter/oscar/update-twttr-maven

    use https for twttr maven
    ianoc committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    051d04a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    58349ec View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1768 from piyushnarang/cascading3

    Bump Cascading version to 3.2.1
    johnynek committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    98eda5f View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. Configuration menu
    Copy the full SHA
    54c1fa0 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2018

  1. Merge pull request #1770 from piyushnarang/cascading3

    Update packages in scalding-parquet-scrooge cascading to match files
    johnynek committed Jan 27, 2018
    Configuration menu
    Copy the full SHA
    5a77674 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2018

  1. Remove a quadradic function in our cascading3 support (#1779)

    * Remove a quadradic function in our cascading3 support
    
    * fix a bug
    johnynek committed Jan 31, 2018
    Configuration menu
    Copy the full SHA
    4514905 View commit details
    Browse the repository at this point in the history