Marco Mancini
9e27ae9140
Fix reserved cpus computation
...
Added test as Vieux suggested/Fixed CpuShare computation
Signed-off-by: Marco Mancini <marcomancini72@gmail.com >
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-04 18:59:15 -07:00
Stephen J Day
c54adb667f
Clarify that manifests can only be deleted by digest
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-06-04 18:59:08 -07:00
Stephen J Day
d24bfb776b
Update tarsum package
...
This PR addresses some issues contributors have been having with updating
dependencies. The tarsum package had required an external google package which
is no longer required. This was being picked up as an import rewrite and
getting removed. It is no longer present, so we can just update the package and
delete the tar package.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-06-04 18:39:25 -07:00
Victor Vieux
c1020da636
nits
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-04 18:25:51 -07:00
Victor Vieux
4f9c9f5867
use dockerclient structs
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-04 18:25:51 -07:00
Victor Vieux
2bf6c1a529
improve docker infi with 1.7
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-04 18:25:51 -07:00
Jeffrey Morgan
ce2452bffd
Move binary download code to gulp
2015-06-04 18:10:06 -07:00
Andrea Luzzardi
c534c29705
Merge pull request #903 from vieux/cpu_test
...
fix -c calculation
2015-06-04 18:06:59 -07:00
Jeffrey Morgan
7b507067e9
Fixed bug where react.js would be loaded twice on windows
2015-06-04 18:00:11 -07:00
Victor Vieux
15a8b73ab6
fix cpus
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-04 17:26:32 -07:00
Samuel Karp
ed39fbeb2a
Adjust disallowed CpuShares in /containers/create
...
Previous versions of libcontainer allowed CpuShares that were greater
than the maximum or less than the minimum supported by the kernel, and
relied on the kernel to do the right thing. Newer libcontainer fails
after creating the container if the requested CpuShares is different
from what was actually created by the kernel, which breaks compatibility
with earlier Docker Remote API versions. This change explicitly adjusts
the requested CpuShares in API versions < 1.20.
Signed-off-by: Samuel Karp <skarp@amazon.com >
2015-06-04 17:19:39 -07:00
Victor Vieux
6c9bf75dcd
add -c test
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-04 17:15:13 -07:00
Jessie Frazelle
cd1a1ee972
Merge pull request #13752 from tianon/fix-release-debs
...
Fix release script to release _both_ .deb files
2015-06-04 16:37:59 -07:00
Stephen J Day
4bff4910b5
Add more repository name validation test cases
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-06-04 16:12:35 -07:00
David Calavera
e33aeac708
Merge pull request #13640 from Microsoft/10662-implementmeminfo
...
Windows: Implement ReadMemInfo()
2015-06-04 16:09:24 -07:00
Tianon Gravi
4572329d4b
Fix release script to release _both_ .deb files
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-06-04 16:08:12 -07:00
Antonio Murdaca
a06e0bb8b4
Merge pull request #13648 from tiborvass/print-debugtransport-to-test-output
...
registry: debugTransport should print with testing.T.Log
2015-06-05 00:42:22 +02:00
Nathan LeClaire
e75b6a5e5f
Add some helpers and patch ups to the integration tests
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-06-04 15:41:37 -07:00
Brian Goff
a2602c617d
Merge pull request #13684 from lizf-os/cleanup-verify-volumes-info
...
Cleanup Daemon.verifyVolumesInfo() a bit
2015-06-04 15:39:31 -07:00
Victor Vieux
5b358156de
Merge pull request #885 from vieux/use_inspect_from_mesos_0.23
...
use inspect sent by mesos 0.23
2015-06-04 15:39:03 -07:00
Victor Vieux
e87f83d78c
add test to make sure it doesn't deadlock
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-04 15:09:39 -07:00
Sean Li
da8bc924ab
New container page style change.
2015-06-04 15:08:44 -07:00
Victor Vieux
b661323bc3
Merge pull request #900 from chanwit/test-bridge-mode
...
port filter integration test for bridge mode
2015-06-04 14:56:46 -07:00
Evan Hazlett
7c669e2c4c
Merge pull request #1307 from ehazlett/maintainers
...
add nathan to maintainers
2015-06-04 17:44:21 -04:00
Evan Hazlett
f2e6a89970
add nathan to maintainers
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-06-04 17:43:48 -04:00
Victor Vieux
4212b69c96
use inspect sent by mesos 0.23
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-04 14:42:37 -07:00
Victor Vieux
3cc53769ec
Merge pull request #894 from vieux/mesos_in_ci
...
Add mesos in the CI
2015-06-04 14:40:19 -07:00
Victor Vieux
6dc6134163
add mesos in the CI
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-04 14:25:13 -07:00
Brian Goff
0c84604f54
Fix goroutine leak on logs -f with no output
...
Also noticed potential hang when only stdout or stderr are used with
follow=1
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-04 13:56:40 -07:00
Andrea Luzzardi
3324bde0c5
Merge pull request #884 from abronan/fix_consul_ephemeral
...
store: Fix ephemeral behavior with Consul
2015-06-04 13:56:16 -07:00
Sean Li
600c258d65
Refactored header rendering.
2015-06-04 13:54:23 -07:00
Sean Li
bb98625da0
Refactoring front end.
2015-06-04 13:44:58 -07:00
John Howard
543cf79ffb
Add GOOS in User-Agent
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-04 13:37:41 -07:00
Alexandre Beslic
c37bead075
Fix ephemeral with multiple keys and previous active sessions
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-06-04 13:34:35 -07:00
Koichi Shiraishi
0dc1cc0ff3
Update AMI to release 20150603
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com >
2015-06-05 05:33:06 +09:00
Evan Hazlett
7190a5c226
docs: add note about changing ssh user for provider image
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
docs: fixed suggestions from nathan
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-06-04 16:07:56 -04:00
Evan Hazlett
b7fa6456bf
docs: more info about supported base operating systems; removed change log from docs
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-06-04 16:07:56 -04:00
Chanwit Kaewkasi
780a936b74
port filter integration test for bridge mode
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-06-05 02:11:27 +07:00
Arnaud Porterie
b63ec6e4b1
Merge pull request #13734 from aboch/master
...
Fix for #13720 . Unpublished ports missing in docker ps
2015-06-04 12:05:47 -07:00
Evan Hazlett
d8419af0b2
Merge pull request #1255 from exoscale/fix/exoscale-wait-vm
...
exoscale: ensure we sleep a bit while waiting for the VM to be ready
2015-06-04 14:56:32 -04:00
Alexandre Beslic
8373ed2c1a
store: Fix Consul ephemeral behavior at agent restart by recovering the existing global session
...
Signed-off-by: Alexandre Beslic <abronan@docker.com >
2015-06-04 11:52:26 -07:00
John Howard
fd935ee63d
Windows: Build docker.exe manifested and with icon
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
2015-06-04 11:49:10 -07:00
Andrea Luzzardi
6fcdb572fb
Merge pull request #881 from abronan/consul_cas_fix
...
store: Fix CAS returning ErrKeyModified because of Lock in Consul
2015-06-04 11:44:21 -07:00
Andrea Luzzardi
3de31a3642
Merge pull request #895 from abronan/zk_list_deletetree
...
store: Fix zookeeper List call, implement DeleteTree
2015-06-04 11:43:55 -07:00
Andrea Luzzardi
8fb8f47f4a
Merge pull request #896 from abronan/fix_zookeeper_watch
...
store: Fix Zookeeper single Key watch
2015-06-04 11:43:35 -07:00
Stephen Day
97ca39d26d
Merge pull request #594 from HuKeping/master
...
Fix typo
2015-06-04 11:32:10 -07:00
Stephen Day
57c5f28096
Merge pull request #589 from thaJeztah/contributing-545-follow-up
...
Minor contributing fixups
2015-06-04 11:31:15 -07:00
Victor Vieux
43e79e0206
Merge pull request #897 from vieux/fix_panic_disconnect
...
fix panic is disconnect
2015-06-04 11:29:43 -07:00
Victor Vieux
e8445ed8ce
fix panic is disconnect
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-04 11:27:17 -07:00
Michael Crosby
b26428257f
Merge pull request #13728 from calavera/copy_old_volume_content
...
Migrate data from old vfs paths to new local volumes path.
2015-06-04 11:14:34 -07:00