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

Merge should work with a regex #72

Merged
merged 7 commits into from
Oct 21, 2014
Merged

Merge should work with a regex #72

merged 7 commits into from
Oct 21, 2014

Commits on Oct 21, 2014

  1. Modify merge to work with regex

    @jvshahid
    jvshahid committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    465614c View commit details
    Browse the repository at this point in the history

  2. More logging

    @jvshahid
    jvshahid committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    a9d9230 View commit details
    Browse the repository at this point in the history

  3. Merge points at the shard level

    @jvshahid
    jvshahid committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    78b99f6 View commit details
    Browse the repository at this point in the history

  4. Return the merged data using the alias 

    Since we return an error if the same series has more than one alias this
fixes #270
    @jvshahid
    jvshahid committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    7839677 View commit details
    Browse the repository at this point in the history

  5. rename a test file

    @jvshahid
    jvshahid committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    e8be757 View commit details
    Browse the repository at this point in the history

  6. Use the standard heap implementation

    @jvshahid
    jvshahid committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    911e1b9 View commit details
    Browse the repository at this point in the history

  7. make sure we close the point iterators

    @jvshahid
    jvshahid committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    44643de View commit details
    Browse the repository at this point in the history