Skip to content

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 8, 2016

@tianon
Copy link
Member Author

tianon commented Aug 8, 2016

I'm planning to deal with whatever rebase fallout comes out of #139 too (if any).

@yosifkit
Copy link
Member

yosifkit commented Aug 9, 2016

LGTM, and no merge conflicts!

@yosifkit yosifkit merged commit 2664a9b into docker-library:master Aug 9, 2016
@yosifkit yosifkit deleted the dbm branch August 9, 2016 00:01
tianon added a commit to infosiftr/stackbrew that referenced this pull request Aug 9, 2016
- `elasticsearch`: 5.0.0-alpha5 (docker-library/elasticsearch#113)
- `php`: `/etc/apache2/envvars` tweaks (docker-library/php#282), `--enable-ftp` (docker-library/php#287)
- `piwik`: swap from merge commit to commit with substance (direct output of `generate-stackbrew-library.sh`)
- `python`: templates (docker-library/python#139), fix `import dbm` (docker-library/python#140)
tianon added a commit to infosiftr/stackbrew that referenced this pull request Aug 9, 2016
- `elasticsearch`: 5.0.0-alpha5 (docker-library/elasticsearch#113)
- `piwik`: swap from merge commit to commit with substance (direct output of `generate-stackbrew-library.sh`)
- `python`: templates (docker-library/python#139), fix `import dbm` (docker-library/python#140)
JayH5 added a commit to praekeltfoundation/docker-alpine-python that referenced this pull request Aug 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants