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

1.1.5 merges #8323

Merged
merged 3 commits into from
Apr 28, 2017
Merged

1.1.5 merges #8323

merged 3 commits into from
Apr 28, 2017

Conversation

rbetts
Copy link
Contributor

@rbetts rbetts commented Apr 26, 2017 •
edited by jwilder
Loading

Cherry pick #8187 (PR) and #8190 to the 1.1 release branch. Needs to be reviewed for completeness as well as correctness.

Required for all non-trivial PRs
  • Rebased/mergable
  • Tests pass
  • CHANGELOG.md updated
  • Sign CLA (if not already signed)
Required only if applicable

You can erase any checkboxes below this note if they are not applicable to your Pull Request.

  • InfluxQL Spec updated
  • Provide example syntax
  • Update man page when modifying a command
  • Config changes: update sample config (etc/config.sample.toml), server NewDemoConfig method, and Diagnostics methods reporting config settings, if necessary
  • InfluxData Documentation: issue filed or pull request submitted <link to issue or pull request>

@rbetts rbetts added the review label Apr 26, 2017
@rbetts rbetts requested review from jwilder and corylanou April 26, 2017 01:32
@rbetts rbetts changed the base branch from master to 1.1 April 26, 2017 01:33
@jwilder
Copy link
Contributor

jwilder commented Apr 26, 2017

Circle failed w/ compiler error:

[ERROR] run: Command 'go test -v -parallel 1 -timeout 960s ./...' failed with error: ?   	github.com/influxdata/influxdb	[no test files]
# github.com/influxdata/influxdb/cmd/influx/cli
cmd/influx/cli/cli.go:228: undefined: influxql in influxql.Sanitize

@rbetts rbetts merged commit db9406d into 1.1 Apr 28, 2017
@rbetts rbetts removed the review label Apr 28, 2017
@rbetts rbetts deleted the 1.1.5-merges branch April 20, 2018 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwilder jwilder jwilder approved these changes

@corylanou corylanou corylanou approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rbetts @jwilder @corylanou