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.

Sign up for GitHub

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

Jump to bottom

Gg/prototype/timeseries range scan filter #145

Open
wants to merge 32 commits into
base: prototype/timeseries-range-scan-filter
Choose a base branch
from
Open

Gg/prototype/timeseries range scan filter #145

wants to merge 32 commits into from

Commits on Sep 4, 2014

  1. Merge branch '2.0' into develop

    @jaredmorrow
    jaredmorrow committed Sep 4, 2014
    Configuration menu
    Copy the full SHA
    c93682a View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2015

  1. Move spec to correct line so we can gen docs

    @russelldb
    russelldb committed Jan 8, 2015
    10 Configuration menu
    Copy the full SHA
    074949b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #132 from basho/bug/rdb/doc-gen 

    Move spec to correct line so we can gen docs

Reviewed-by: russelldb
    @borshop
    borshop committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    10fcb78 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2015

  1. Merge branch '2.0' into develop-2.0-merge 

    Conflicts:
	rebar.config
    @cmeiklejohn
    cmeiklejohn committed Feb 13, 2015
    5 Configuration menu
    Copy the full SHA
    5bcb7ac View commit details
    Browse the repository at this point in the history

  2. Merge pull request #133 from basho/develop-2.0-merge 

    Develop 2.0 merge.

Reviewed-by: aberghage
    @borshop
    borshop committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    a5b5148 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2015

  1. use version 2.0.1 of cuttlefish

    @andrewjstone
    andrewjstone committed Feb 17, 2015
    5 Configuration menu
    Copy the full SHA
    1fb0a2d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #134 from basho/the-great-versioning 

    use version 2.0.1 of cuttlefish

Reviewed-by: cmeiklejohn
    @borshop
    borshop committed Feb 17, 2015
    Configuration menu
    Copy the full SHA
    0e4e4e7 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2015

  1. async_put (immutable work-in-progress)

    @jtuple
    jtuple committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    9df7c69 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2015

  1. Fixed dialyzer spec for asyc_put

    @fadushin
    fadushin committed Mar 27, 2015
    Configuration menu
    Copy the full SHA
    26a1ac6 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2015

  1. Extended EQC test for async_put.

    Jon Meredith committed Mar 30, 2015
    5 Configuration menu
    Copy the full SHA
    d946c61 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #137 from basho/jdb-immutable-wip 

    Async Put Support

Reviewed-by: jonmeredith
    @borshop
    borshop committed Mar 30, 2015
    Configuration menu
    Copy the full SHA
    a36dbd6 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2015

  1. Bumped leveldb version to pick up sequential tunings

    Jon Meredith committed May 29, 2015
    5 Configuration menu
    Copy the full SHA
    b544b75 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #139 from basho/jdm/update-leveldb-to-2.0.1 

    Bumped leveldb version to pick up sequential tunings

Reviewed-by: engelsanchez
    @borshop
    borshop committed May 29, 2015
    Configuration menu
    Copy the full SHA
    6c39434 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2015

  1. Update build_deps to pull leveldb 2.0.2

    Matthew V committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    58bb388 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2015

  1. push leveldb version string into environment for build.

    Matthew V committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    812335f View commit details
    Browse the repository at this point in the history

  2. Bumping leveldb to 2.0.3

    Jon Meredith committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    cbcee67 View commit details
    Browse the repository at this point in the history

  3. Merge branch '2.0' into develop

    Jon Meredith committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    b51dce2 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2015

  1. Merge pull request #140 from ahf/cleanup-lager 

    Remove lager parse transform
    Jon Meredith authored and Jon Meredith committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    4f8e032 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2015

  1. interim commit of changed API for TS - needs dialyzer fix

    Gordon Guthrie committed Aug 7, 2015
    Configuration menu
    Copy the full SHA
    f9cae4f View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2015

  1. backport develop to 2.1 branch on 8/11/15

    Matthew Von-Maszewski committed Aug 11, 2015
    Configuration menu
    Copy the full SHA
    e31a6de View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2015

  1. minor refactoring for time series integration

    Gordon Guthrie committed Aug 17, 2015
    Configuration menu
    Copy the full SHA
    90b263a View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2015

  1. pin cuttlefish for e2e/ts

    @hmmr
    hmmr committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    e726705 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2015

  1. Starting again, this time from gg/prototype/timeseries-range-scan-fil… 

    …ter branch! First commit just changes leveldb VSN to point to corresponding feature/streaming-folds-filter branch
    erikleitch committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    029ae98 View commit details
    Browse the repository at this point in the history

  2. Commented out macosx-version-min Opt from rebar.config.script, which … 

    …prevents any of the C++11 features from compiling under Yosemite. Needs further work to resolve this
    erikleitch committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    e7bee9f View commit details
    Browse the repository at this point in the history

  3. Removed macosx-min flag from rebar.config.script which prevents C++11… 

    … code from compiling on Yosemite. Set leveldb VSN to end-to-end/timeseries for this branch
    erikleitch committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    a895dac View commit details
    Browse the repository at this point in the history

  4. First successful compile of merge of streaming folds + filtering code… 

    …. NB: COMPILED -- not TESTED
    erikleitch committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    5c767c3 View commit details
    Browse the repository at this point in the history

  5. Added back range scan stuff for backwards compatibility (now supports… 

    … both range scan and streaming folds
    erikleitch committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    8f8d398 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. Fixed initializations preventing the code from compiling on buildbot

    vagrant committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    606fccc View commit details
    Browse the repository at this point in the history

  2. Fixed range_scan_ack declaration in eleveldb.erl that failed dialyzer… 

    … test
    erikleitch committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    925a9bd View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2015

  1. Merging with changes I committed to end-to-end branch

    erikleitch committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    072e905 View commit details
    Browse the repository at this point in the history

  2. Merged with 2.1, end-to-end

    erikleitch committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    78e2054 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2015

  1. make decode_record return the thing, rather than {ok, Thing}

    @hmmr
    hmmr committed Sep 3, 2015
    Configuration menu
    Copy the full SHA
    3c73083 View commit details
    Browse the repository at this point in the history