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

elasticsearch-curator-5.4.1 on release-17.09 #33760

Merged
merged 7 commits into from Jan 14, 2018
Merged

elasticsearch-curator-5.4.1 on release-17.09 #33760

merged 7 commits into from Jan 14, 2018

Conversation

basvandijk
Copy link
Member

Motivation for this change

@orivej I would like to use elasticsearch-curator on 17.09 so I cherry picked the commits from #32905 on release-17.09.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

basvandijk and others added 4 commits January 12, 2018 00:52
@basvandijk
python.pkgs.voluptuous: init at 0.10.5
268b58e 
Needed by elasticsearch-curator.

(cherry picked from commit b513fc7)
@orivej @basvandijk
python.pkgs.pyelasticsearch: delete
724e38f 
because it requires python.pkgs.elasticsearch 1.x.y, which is compatible only
with the ancient Elasticsearch 1.

(cherry picked from commit f0c4bea)
@basvandijk
python.pkgs.elasticsearch: 1.9.0 -> 6.0.0
d64c223 
(cherry picked from commit d513afc)
@basvandijk
python.pkgs.elasticsearch-curator: init at 5.4.1
2fd5266 
(cherry picked from commit 85ee9df)
@basvandijk
Copy link
Member Author

@FRidh thanks for the review. I think it's better if we first make these changes on master and then cherry-pick them on release-17.09. I can do that if you don't beat me to it.

@basvandijk basvandijk mentioned this pull request Jan 12, 2018
Merged
8 tasks
@FRidh
Copy link
Member

FRidh commented Jan 14, 2018

@basvandijk ah, I had missed this was for 17.09.

@basvandijk
Copy link
Member Author

@FRidh I cherry-picked #33774 into this PR. It should be ready to merge now.

@FRidh
Copy link
Member

FRidh commented Jan 14, 2018

Actually, not yet. Implicit name attribute was added after branching off (#31173). That means, either name should be added again, or we should backport 78ed9da. We should go for the latter as it is harmless.

@FRidh
Copy link
Member

FRidh commented Jan 14, 2018

Pushed eb2e3be.

@FRidh FRidh merged commit 1c104f9 into NixOS:release-17.09 Jan 14, 2018
@basvandijk
Copy link
Member Author

Woops we pushed eb2e3be at the same time causing it to occur twice in release-17.09. But that doesn't really matter. Thanks for help and merge!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@basvandijk @FRidh @GrahamcOfBorg @orivej