Skip to content

Add 1.6.1 commits#13073

Merged
calavera merged 8 commits intomoby:masterfrom
jessfraz:add_1.6.1_commits
May 7, 2015
Merged

Add 1.6.1 commits#13073
calavera merged 8 commits intomoby:masterfrom
jessfraz:add_1.6.1_commits

Conversation

@jessfraz
Copy link
Copy Markdown
Contributor

@jessfraz jessfraz commented May 7, 2015

add commits from release branch for 1.6.1 to master

ping @crosbymichael @LK4D4 @tiborvass

Signed-off-by: Michael Crosby <[email protected]>

Conflicts:
	integration-cli/docker_cli_run_test.go
Signed-off-by: Michael Crosby <[email protected]>
These files in /proc should not be able to be read as well
as written to.

Signed-off-by: Michael Crosby <[email protected]>
Signed-off-by: Michael Crosby <[email protected]>

Add tests for mounting into /proc and /sys

These two locations should be prohibited from mounting volumes into
those destinations.

Signed-off-by: Michael Crosby <[email protected]>
@jessfraz
Copy link
Copy Markdown
Contributor Author

jessfraz commented May 7, 2015

ah forgot release notes commit my b

Signed-off-by: Jessica Frazelle <[email protected]>
(cherry picked from commit 97cd073)

Conflicts:
	VERSION
@jessfraz jessfraz force-pushed the add_1.6.1_commits branch 3 times, most recently from d6024e2 to c8a4212 Compare May 7, 2015 22:40
Signed-off-by: Jessica Frazelle <[email protected]>
@jessfraz jessfraz force-pushed the add_1.6.1_commits branch from c8a4212 to 2c2f6fd Compare May 7, 2015 22:42
@crosbymichael
Copy link
Copy Markdown
Contributor

LGTM

@calavera
Copy link
Copy Markdown
Contributor

calavera commented May 7, 2015

LGTM

calavera added a commit that referenced this pull request May 7, 2015
@calavera calavera merged commit 23193ef into moby:master May 7, 2015
@jessfraz jessfraz deleted the add_1.6.1_commits branch May 7, 2015 23:19
@thaJeztah thaJeztah mentioned this pull request Nov 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants