0d3afdf0c8
Remove engine usage for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c9eb37f9752d72d9a4280d703368e5e73adfffa1
Component: engine
2015-04-07 08:43:18 -07:00
f940ea3485
New package daemon/events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 868f56e0839cb47223a7d988f21ae623d4ea9c6e
Component: engine
2015-04-07 08:43:14 -07:00
d1f6bdefa9
Merge pull request #12125 from LK4D4/fix_events_streaming_test
...
Fix events streaming test
Upstream-commit: 3588c5fbc7ec00b3de6761d1121186b0d39afef1
Component: engine
2015-04-06 17:12:48 -04:00
5c284b836c
Decrease timeouts in TestEventsStreaming
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: e45bf8d2e9b43a4f5c5ed844b333733f95ccbafb
Component: engine
2015-04-06 13:40:56 -07:00
b38d23a637
Pass right timestamp instead of crap from string(int64)
...
Problem is that --since can consume anything not near looking as
timestamp.
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 5fa3a6f2482521d5731c43e076926f2f5318aa94
Component: engine
2015-04-06 13:39:02 -07:00
d69d67a964
Merge pull request #12070 from duglin/RemoveTableCLI
...
Last step in removing engine.Table from api/client/*
Upstream-commit: dec48d6708aa9fc7732d2451d9913e612fc989be
Component: engine
2015-04-06 16:33:29 -04:00
cffe4fa24a
Merge pull request #11686 from willhf/9340_test
...
Add test for net=container and links
Upstream-commit: 8a50746b5d7783b734c6096b4e2ef444e901397e
Component: engine
2015-04-06 13:21:01 -07:00
d62565ffca
Revert "Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY."
...
COPY was not deprecated.
This reverts commit 3148063af16e5c14ea543f615d136f477a4e9537.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: d2992c78dc1f71b0844b3c17d5ea9be8fff8b15e
Component: engine
2015-04-06 15:34:10 -04:00
dc2be073c9
Merge pull request #12064 from brendandixon/win-cli/rawfix
...
Windows console fixes
Upstream-commit: 37a16580b1d62161abb3ef9288903f5883a0173e
Component: engine
2015-04-06 18:45:08 +00:00
136a897ab2
Merge pull request #11993 from crunchywelch/master
...
add centos to supported distros
Upstream-commit: 9cad920c08664bae2b69d71f5588d9e797f0e6e8
Component: engine
2015-04-06 11:44:40 -07:00
a0e29b0a30
Merge pull request #12093 from malnick/malnick_dockerfile_best_practice_update
...
Updated the dockerfile best practice section on ADD and COPY
Upstream-commit: 2c44556ff9d94ddeca09349c8c4669a47cfe22fb
Component: engine
2015-04-06 11:43:50 -07:00
84e28d150d
Merge pull request #12055 from l0kix2/patch-1
...
Improved "start a container" section 1.16 & 1.17 API docs
Upstream-commit: ce18734c2cffebe112d06dca9117150ceaa08e15
Component: engine
2015-04-06 11:41:38 -07:00
ec38205886
Merge pull request #11324 from sunyuan3/TestDaemonwithwrongkey
...
add TestDaemonwithwrongkey test case
Upstream-commit: f5657249a0120e48975fbe986dde78b7975dac17
Component: engine
2015-04-06 11:35:05 -07:00
92a7113498
Merge pull request #12090 from runcom/12079-events-streaming-tests
...
Test events streaming
Upstream-commit: a0fc0343b7e8ac1a363ab856b87d6a9524d425cf
Component: engine
2015-04-06 11:23:47 -07:00
142a5765d0
Merge pull request #11978 from x1022as/info-show-loggingdriver
...
docker info show logging driver info
Upstream-commit: ed8d4028519460017e5a8641882bd9a2e68ceb29
Component: engine
2015-04-06 11:11:31 -07:00
ef8d6cbdf1
Last step in removing engine.Tabel from api/client/*
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 065648a8324a0df5d5d05b3df223e6b058260425
Component: engine
2015-04-06 10:55:53 -07:00
4642e7f120
Merge pull request #11293 from shishir-a412ed/docker_load_clobber_image_name
...
Fix for Issue 11285: warning message displayed when updating an existing image
Upstream-commit: 281b8f67e145f58a3b364ce469ae71e216961e8c
Component: engine
2015-04-06 13:04:49 -04:00
ea1fc2ed3e
Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY.
...
Signed-off-by: malnick <malnick@gmail.com >
Upstream-commit: 3148063af16e5c14ea543f615d136f477a4e9537
Component: engine
2015-04-06 10:04:42 -07:00
a65903a8b7
Merge pull request #12100 from draghuram/docker_update
...
Add the missing option to the wget command for updating Docker.
Upstream-commit: 3e077bb3f73c4effa3135851811b23f1292ebe24
Component: engine
2015-04-06 10:03:23 -07:00
286897aa48
Test events streaming, fixes #12079
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: d1c4439b5aa9bfc6767372b64e3f3a1fdb7f7b65
Component: engine
2015-04-06 19:00:17 +02:00
42264ee36e
Merge pull request #12020 from chenhanxiao/docker-import-commit
...
docs: keep the style of docker-commit consistent with docker-import
Upstream-commit: 96c3141fa5c81e3d672215d5bfcfb7534e96af2f
Component: engine
2015-04-06 09:47:47 -07:00
45fb864556
Merge pull request #12112 from kostickm/12042-fix-logDone-format
...
Fixes logDone format
Upstream-commit: d3fa57e051cced38cdd65034077fe5b080999da7
Component: engine
2015-04-06 12:34:38 -04:00
42e6264f16
Merge pull request #10275 from Snorch/master
...
docker-tests: mount hierarchies and make symlinks for subsystems
Upstream-commit: 8b4c3a111d025bdb7c4f78eaa233a7c74295ad67
Component: engine
2015-04-06 10:32:04 -06:00
07de27cc12
Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754
...
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
Upstream-commit: d489b91aa94a6e15d7d1daa953468cac9866f218
Component: engine
2015-04-06 09:23:53 -07:00
cedce1294d
Merge pull request #11554 from Sirupsen/logrus-fields
...
logging: use logrus fields
Upstream-commit: ac93a13e2745559887b5c5efd3cff1ed904f5092
Component: engine
2015-04-06 09:00:18 -07:00
f18fe75c72
Closes #12042 - fix logDone format
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: d6ada45f45c6743ec0ab3f049a0742278634a22a
Component: engine
2015-04-06 08:54:35 -07:00
65d39050f9
Merge pull request #12102 from x1022as/typo
...
fix typo
Upstream-commit: 90be2a66a8d5a179c976da5525a314fe5cd6cb59
Component: engine
2015-04-06 08:46:41 -07:00
a714c4cf33
Merge pull request #12107 from cpuguy83/remove_striptrailingchars
...
Remove `stripTrailingCharacters` from tests
Upstream-commit: b9d2ede4d4dc67b97abd0254a9e431aa9c89b932
Component: engine
2015-04-06 08:46:08 -07:00
9d932cfc62
Minor spelling fix
...
Signed-off-by: Eohyung Lee <liquidnuker@gmail.com >
Upstream-commit: 7986c37996aa7321eaf3e86dd844a3e5c36c8c68
Component: engine
2015-04-06 23:27:53 +09:00
ab9a366f0e
Remove stripTrailingCharacters from tests
...
This was just an alias to `strings.TrimSpace`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 475c65319b4663d630711519e18d0b134c42c7f1
Component: engine
2015-04-06 09:21:18 -04:00
9d18deed31
Applying: Fix for Issue 11285: warning message displayed when updating an existing image
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 7d0053d554c453f0ec426bde2899dd55a265f09a
Component: engine
2015-04-06 09:05:03 -04:00
403c32d670
fix typo in cli.md
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: 71de711189659847ea18313b7b0a57703960d0da
Component: engine
2015-04-06 16:11:40 +08:00
c201586780
Add the missing option to the wget command for updating Docker.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 9287e70c127b00bddb5a8d49f5ca97c19ac0614b
Component: engine
2015-04-05 23:00:21 -04:00
064a2244e0
Fix incompatible flags conditional
...
Signed-off-by: willhf <willhf@gmail.com >
Upstream-commit: bc0cdc0a4c1c83abcf1d8500e8a39f67183963ae
Component: engine
2015-04-05 19:38:31 -07:00
42748e46e4
fix the space thing.
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Upstream-commit: 5057d7da132c287d52749b6c73a9cd6129a1c05a
Component: engine
2015-04-06 09:00:59 +08:00
5cd5d0bf57
add TestDaemonwithwrongkey test case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: ef13dcd4dcbc613a9ea1e4a8af3d0220004ec0ab
Component: engine
2015-04-06 08:57:47 +08:00
00cc5b6eeb
Remove "stupid" wording
...
Signed-off-by: José Tomás Albornoz <jojo@eljojo.net >
Upstream-commit: 4cf5a1c2aa2f95a0bca5a0bf47026518b7b2167f
Component: engine
2015-04-04 15:26:45 +02:00
828102e65e
Improved "start a container" section in 1.16 & 1.17 docs
...
It seems it was lost or something
Signed-off-by: Kirill Sibirev <l0kix2@gmail.com >
Upstream-commit: ac12c8053779d36409e248f41c4d80ef0e4fbe9f
Component: engine
2015-04-04 11:23:49 +03:00
7919b8b131
Fix a minor typo
...
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com >
Upstream-commit: ffcc4a1e52def3b1552ae3c7ba4ee1fb47f92cea
Component: engine
2015-04-04 15:36:35 +08:00
ac2db88b40
Merge pull request #12063 from icecrime/update_maintainers
...
Several updates to MAINTAINERS file
Upstream-commit: 2a79d54f4c62165ee348adf98297950e886f1d4b
Component: engine
2015-04-03 17:20:20 -07:00
3099776db6
Add thaJeztah
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 886026f99e4b13b0fa2ee4c5582786a863e1d0d1
Component: engine
2015-04-03 16:37:36 -07:00
c96dd46bbb
Make NOTICE in the README into a link
...
Signed-off-by: Huu Nguyen <whoshuu@gmail.com >
Upstream-commit: d94e186442ef4ba3103a6ad72666782179d3c2b8
Component: engine
2015-04-03 16:36:49 -07:00
5743caf126
daemon: convert version log statement to fields
...
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com >
Upstream-commit: e1ca439828c33a186489da568a29d3f3a2951e03
Component: engine
2015-04-03 18:22:17 -04:00
6db76a476b
test-unit: fix TESTFLAGS doc
...
Signed-off-by: Johan Euphrosine <proppy@google.com >
Upstream-commit: 5846914f91f16c9d940701c9bbc0ebb8ab3c4226
Component: engine
2015-04-03 15:05:14 -07:00
bdfc59cfb7
Windows console fixes
...
Corrected integer size passed to Windows
Corrected DisableEcho / SetRawTerminal to not modify state
Cleaned up and made routines more idiomatic
Corrected raw mode state bits
Removed duplicate IsTerminal
Corrected off-by-one error
Minor idiomatic change
Signed-off-by: Brendan Dixon <brendand@microsoft.com >
Upstream-commit: 1a36a113d4afc11151c80b111d7357b7c31be32b
Component: engine
2015-04-03 15:02:52 -07:00
64ee249cb8
Rename status labels
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 58f07c9d8aa9b54f74af141d74314b607e2c18c5
Component: engine
2015-04-03 14:33:16 -07:00
b00d56f4e3
Sort maintainers alphabetically
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 80f3085651717f2f487ae41633490db59716cc04
Component: engine
2015-04-03 14:33:16 -07:00
fcb663dbcb
Move docs approval section
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 370cef012e81f11a87fcf7f1384dbbca6cab0c6c
Component: engine
2015-04-03 14:33:16 -07:00
8973909f13
Merge pull request #12060 from duglin/RemoveTable3
...
Remove engine.Table from docker search and fix missing field
Upstream-commit: b2fbd9e632191e6d6494b7dfd4dc0798e1fa47c7
Component: engine
2015-04-03 21:29:36 +00:00
d1ddfb9a9a
Merge pull request #11886 from jamiehannaford/pkg-mnt-docs
...
Document exported functions and consts in pkg/mount
Upstream-commit: 9cdad8a26b4af14680c4bcb25feea854536a323b
Component: engine
2015-04-03 21:28:11 +00:00
