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 from 0.2 #869

Merged
merged 16 commits into from
Jan 6, 2018
Merged

Merge from 0.2 #869

merged 16 commits into from
Jan 6, 2018

Conversation

twilmes
Copy link
Contributor

@twilmes twilmes commented Jan 5, 2018

Putting this together and I think my previous 0.2 rebase into master hosed things up so this doesn't look great. Though the diff looks right, the commits had me wondering and my git skills could use some double checking here so review and any advice from folks would be much appreciated. Thanks in advance.


Thank you for contributing to JanusGraph!

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there an issue associated with this PR? Is it referenced in the commit message?
  • Does your PR body contain #xyz where xyz is the issue number you are trying to resolve?
  • Has your PR been rebased against the latest commit within the target branch (typically master)?
  • Is your initial contribution a single, squashed commit?

For code changes:

  • Have you written and/or updated unit tests to verify your changes?
  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE.txt file, including the main LICENSE.txt file in the root of this repository?
  • If applicable, have you updated the NOTICE.txt file, including the main NOTICE.txt file found in the root of this repository?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?
  • If this PR is a documentation-only change, have you added a [skip ci]
    tag to the first line of your commit message to avoid spending CPU cycles in
    Travis CI when no code, tests, or build configuration are modified?

Note:

Please ensure that once the PR is submitted, you check Travis CI for build issues and submit an update to your PR as soon as possible.

davidclement90 and others added 16 commits December 10, 2017 19:42
Issue : JanusGraph#815

Signed-off-by: David Clement <david.clement90@laposte.net>
Upgrading Cloud Bigtable dependency to v1.0.0.
Update default Elasticsearch version to ES 6.0.1
Use `group: travis_latest` instead of `dist: trusty` to pick up the latest
Travis CI image changes. The new default is `group: travis_lts` which is
equivalent to the now-deprecated `dist: trusty`.

More info in this blog post:
https://blog.travis-ci.com/2017-12-01-new-update-schedule-for-linux-build-images

Fixes JanusGraph#811.

Signed-off-by: Misha Brukman <mbrukman@google.com>
Use `y` for minor version instead of `z`, which is the patch version.

This makes it consistent with our other version number specifications, and the
SemVer format as documented on https://semver.org/ as well.

Fixes JanusGraph#818.

Signed-off-by: Misha Brukman <mbrukman@google.com>
Switch to Travis CI latest image versions.
`org.JanusGraph` is incorrect; should be `org.janusgraph` instead.

Fixes JanusGraph#825.

Signed-off-by: Misha Brukman <mbrukman@google.com>
…-case

Fix case of JanusGraph packages in docs. [skip ci]
Copyright header addition relates to issue JanusGraph#14.

Also updates `.travis.yml.cassandra` to use the latest Travis CI images group.

Signed-off-by: Misha Brukman <mbrukman@google.com>
Elasticsearch backend fails to add value to list property if that property doesn't already exist

Issue : 718

Signed-off-by: David Clement <david.clement90@laposte.net>
foldInIds now correctly leaves other hasContainers intact so that additional predicates are enforced.
* With @severin83's help, the HasStepFolder has been updated to fold Janus compatible global ordering operations into JanusGraphSteps.
* Updated a number of tests to account for the folding of ordering into the JanusGraphVertexStep which therefore allowed the parent LocalStep to be removed.
* The assertNumStep test method was also updated to allow for the verification that a given step was removed by the optimization strategies.
…hasIdX1X_hasIdX2X process test

Updated id folding behavior to match TinkerPop process suite behavior.
@janusgraph-bot janusgraph-bot added the cla: yes This PR is compliant with the CLA label Jan 5, 2018
Copy link
Contributor

@sjudeng sjudeng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should merge this with merge commit (not rebase).

@sjudeng sjudeng merged commit 4ccf5a4 into JanusGraph:master Jan 6, 2018
@robertdale robertdale added this to the Release v0.3.0 milestone Jan 10, 2018
bwatson-rti-org pushed a commit to bwatson-rti-org/janusgraph that referenced this pull request Mar 9, 2019
micpod pushed a commit to micpod/janusgraph that referenced this pull request Nov 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes This PR is compliant with the CLA
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants