Jessica Frazelle 02f274f524 Fix conflicts. ...

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: fd831b4c5e50a3f1de8eb506016ffe89d5cac8d4
Component: engine

2014-12-11 17:14:53 -08:00

..

docker_api_containers_test.go

Check for no Cmd on exec create endpoint

2014-12-01 17:54:15 -05:00

docker_api_exec_test.go

Check for no Cmd on exec create endpoint

2014-12-01 17:54:15 -05:00

docker_api_inspect_test.go

Check for no Cmd on exec create endpoint

2014-12-01 17:54:15 -05:00

docker_api_resize_test.go

Check for no Cmd on exec create endpoint

2014-12-01 17:54:15 -05:00

docker_cli_attach_test.go

Forbid client piping to tty enabled container

2014-12-09 14:30:49 -08:00

docker_cli_build_test.go

Add integration test for xz path issue

2014-12-11 16:29:15 -05:00

docker_cli_commit_test.go

Make sure integration-cli test clean up

2014-11-19 23:41:46 +02:00

docker_cli_cp_test.go

Change path breakout detection logic in archive package

2014-12-09 23:16:03 +02:00

docker_cli_create_test.go

Fix tests with old cmd function.

2014-12-03 15:53:19 -08:00

docker_cli_daemon_test.go

Add --log-level support

2014-11-15 09:00:48 -08:00

docker_cli_diff_test.go

Cleanup errorOut resp in diff test

2014-10-16 15:05:00 -07:00

docker_cli_events_test.go

fix where cmd function dne

2014-11-25 18:34:08 -08:00

docker_cli_exec_test.go

Forbid client piping to tty enabled container

2014-12-09 14:30:49 -08:00

docker_cli_export_import_test.go

Cleanup errorOut resp in export test

2014-10-16 15:05:00 -07:00

docker_cli_history_test.go

Fix vet errors

2014-11-05 08:26:22 -08:00

docker_cli_images_test.go

Fix for #8777

2014-11-20 13:36:46 +09:00

docker_cli_import_test.go

Make sure integration-cli test clean up

2014-11-19 23:41:46 +02:00

docker_cli_info_test.go

Fix vet errors

2014-11-05 08:26:22 -08:00

docker_cli_inspect_test.go

Cleanup errorOut resp in inspect tests

2014-10-16 15:06:19 -07:00

docker_cli_kill_test.go

Cleanup errorOut resp in kill test

2014-10-16 15:05:00 -07:00

docker_cli_links_test.go

Running a container that links to a container with --net host

2014-12-08 11:33:18 -08:00

docker_cli_login_test.go

Fixed a bug - no panic anymore when logining in without TTY

2014-11-17 19:41:27 -08:00

docker_cli_logs_test.go

Fix panic on slow log consumer.

2014-10-30 22:24:57 +02:00

docker_cli_nat_test.go

Fix misuses of format based logging functions

2014-11-19 23:59:02 +02:00

docker_cli_port_test.go

Cleanup errorOut resp in port test

2014-10-16 15:05:00 -07:00

docker_cli_ps_test.go

Fix deadlock in ps exited filter

2014-11-07 16:35:50 +02:00

docker_cli_pull_test.go

Fix vet errors

2014-11-05 08:26:22 -08:00

docker_cli_push_test.go

Fix vet errors

2014-11-05 08:26:22 -08:00

docker_cli_restart_test.go

Cleanup errorOut resp restart tests

2014-10-16 15:06:20 -07:00

docker_cli_rm_test.go

Make sure integration-cli test clean up

2014-11-19 23:41:46 +02:00

docker_cli_rmi_test.go

Remove unnecessary abstraction nLines

2014-12-03 17:47:28 -08:00

docker_cli_run_test.go

Forbid client piping to tty enabled container

2014-12-09 14:30:49 -08:00

docker_cli_save_load_test.go

Fix conflicts.

2014-12-11 17:14:53 -08:00

docker_cli_search_test.go

Fix vet errors

2014-11-05 08:26:22 -08:00

docker_cli_start_test.go

Fixes race condition in test. Closes #9389.

2014-11-28 13:48:50 -05:00

docker_cli_tag_test.go

Merge pull request #8511 from coolljt0725/fix_tag

2014-10-20 14:32:23 -07:00

docker_cli_top_test.go

Cleanup errorOut resp in top tests

2014-10-16 15:06:20 -07:00

docker_cli_version_test.go

Fix vet errors

2014-11-05 08:26:22 -08:00

docker_test_vars.go

Break some routines out of the mutable files test for future use

2014-11-25 16:46:09 -08:00

docker_utils.go

Merge pull request #9356 from cc272309126/fix-exec-paused-container

2014-12-09 11:01:44 -08:00

MAINTAINERS

Fix format in maintainers files

2014-06-02 07:05:06 +00:00

utils.go

Remove unnessary abstraction deepEqual

2014-12-03 17:52:06 -08:00