Merge pull request #7775 from LK4D4/merge_state_lock

Merge Container and State mutexes
Update nodejs_web_app.md
Use increment operator

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
docker top: fix command when multiple arguments are supplied

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Fix panic when `ENV ARG=ARG` is used.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Add a test for the multiple arguments passed to `docker top`

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
fixed error check using the wrong error value

errorOut was using the err from the previous test.

Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com>
Merge pull request #7816 from cnf/fix_cli_top_test

fixed error check using the wrong error value
Fixed error check using the wrong error value

errorOut was using the err from the previous test.
same as #7816 but on TestTopPrivileged, which I missed last time

Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com>
Merge pull request #7817 from cnf/fix_cli_top_test_priv

Fixed error check using the wrong error value
Merge pull request #7805 from nzwsch/patch-1

Update nodejs_web_app.md
Merge pull request #7751 from dchen1107/master

Bump containervm version to the latest one: 20140826
Update debian.md

Add some instructions for Debian 7 (aka Wheezy/Stable)

Signed-off-by: Vishal Doshi <vishal.doshi@gmail.com>
Try to go for 80-char lines and a little md wrangling.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
document the cherry-pick process I'm using to make docs updates

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
alternative to `exit` command: `CTRL-D`

Docker-DCO-1.1-Signed-off-by: Eike Herzbach <eike@herzbach.net> (github: eik3)
Merge pull request #7820 from SvenDowideit/eik3-exit-doc-patch

alternative to `exit` command: `CTRL-D`
Move TestRunCidFileCleanupIfEmpty to integration-cli

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Move TestRunCidFileCheckIDLength to integration-cli

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Merge pull request #7814 from erikh/fix_parser_env

Fix panic when `ENV ARG=ARG` is used.