Jessie Frazelle
b81f2ee5f2
Merge pull request #13953 from crosbymichael/network-mtu
...
Get Mtu from default route
2015-06-15 17:13:44 -07:00
Xian Chaobo
8cd667e996
add unit test for AddSoftImageAffinity
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-06-16 07:52:53 +08:00
Xian Chaobo
8c7c0b248b
reschedule with soft image affinity
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-06-16 07:52:00 +08:00
Michael Chiang
ed9a5a55bb
VS 2013 notes
2015-06-15 16:50:52 -07:00
Michael Crosby
ff4e58ff56
Get Mtu from default route
...
If no Mtu value is provided to the docker daemon, get the mtu from the
default route's interface. If there is no default route, default to a
mtu of 1500.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-06-15 16:33:02 -07:00
Sven Dowideit
9321b618f4
update images to DTR 1.1rc3
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-06-15 16:23:10 -07:00
David Calavera
f48fadd05c
Merge pull request #13941 from unclejack/fix_umask
...
docker/daemon: set umask to the default on startup
2015-06-15 16:19:38 -07:00
Jessie Frazelle
4d23f459ad
Merge pull request #13947 from mavenugo/vin
...
Picking up missed out vendor files via hack/vendor.sh
2015-06-15 16:16:02 -07:00
Jessie Frazelle
748814a97a
Merge pull request #13935 from asbjornenge/tm_syntax_updates
...
TM syntax updates
2015-06-15 16:12:22 -07:00
Aanand Prasad
c421d23c34
Update Swarm docs
...
- Link to libnetwork
- Building now works, but is complicated by scaling
- Document how to set constraints/affinity
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-06-15 15:19:55 -07:00
Mrunal Patel
6d022bda3b
Updates libcontainer to v2.2.1
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-06-15 18:18:38 -04:00
John Howard
59cfc08982
Windows - Really fix VFS this time
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-15 15:09:48 -07:00
Jeffrey Morgan
a47cc6cdee
Fixed bug where error would occur when sending quit message to render process
2015-06-15 14:58:23 -07:00
Antonio Murdaca
835f1c9116
Merge pull request #13547 from coolljt0725/fix_unpause_not_running_container
...
Correct the message of pause and unpause a non-running container
2015-06-15 23:56:32 +02:00
Josh Hawn
86d6a5b11f
Merge pull request #13869 from jlhawn/multi_line_help_usage
...
api/client: Allow for multi-line usage help
2015-06-15 14:50:17 -07:00
Mary Anthony
832cb9d52c
Updating for Hugo
...
Updating for tooling tests
Updating with the new sed scripts to protect links
updating with new image
Updating with comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-15 14:39:33 -07:00
Arnaud Porterie
b3b04fd85a
Merge pull request #13945 from dmcgowan/distribution-store-digest-on-pull
...
Store layer digests on pull
2015-06-15 14:37:30 -07:00
Stephen Day
e57e731821
Merge pull request #548 from duglin/MoveErrors
...
Move ErrorCode logic to new errcode package
2015-06-15 14:33:28 -07:00
Victor Vieux
b8ba1ff52a
Merge pull request #961 from ahmetalpbalkan/patch-3
...
nits: scheduler/node/node.go
2015-06-15 14:23:09 -07:00
Jeffrey Morgan
9550e88fa8
Fixed bug where setup loading bar would always show on windows
2015-06-15 14:21:28 -07:00
Jeffrey Morgan
f121572de6
Disable listening for new log changes on container update for now
2015-06-15 14:20:44 -07:00
Ahmet Alp Balkan
d9f5ba1dd4
nits: scheduler/node/node.go
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-06-15 14:19:56 -07:00
Ahmet Alp Balkan
a65766e686
Container name fix scheduler/filter/README.md
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-06-15 14:16:12 -07:00
Ahmet Alp Balkan
6064e889b7
scheduler/random: Use private instance of rand
...
This does not pollute the global rand instance. It's good for
predictability and determinism in the tests and behavior. Reduces
program state.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-06-15 14:14:15 -07:00
Evan Hazlett
a6a6e16329
vbox: fix vbox race with unregistervm
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-06-15 17:04:46 -04:00
Victor Vieux
ec9c970643
update usage
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-15 14:02:30 -07:00
moxiegirl
d409b05970
Merge pull request #13936 from moxiegirl/test-tooling
...
Updated retooling for Hugo to go out with 1.7
2015-06-15 13:57:12 -07:00
Jeffrey Morgan
26ae83e952
Merge branch 'master' into windows
2015-06-15 13:44:53 -07:00
Jeffrey Morgan
3515c306d5
Fixing bug where removing a volume would require two clicks on the remove button
2015-06-15 13:44:36 -07:00
Victor Vieux
ce10683831
Merge pull request #956 from ahmetalpbalkan/patch-1
...
Fix typo in leadership/README.md
2015-06-15 13:39:10 -07:00
moxiegirl
d3d6454b52
Merge pull request #1359 from moxiegirl/test-tooling
...
Documentation tooling for 1.7 release build using Hugo. Merging with Evan's go ahead with one LGTM
2015-06-15 13:35:14 -07:00
Jeffrey Morgan
4ddf2e613a
Merge pull request #637 from TeckniX/master
...
Fixed scrollbottom
2015-06-15 13:33:50 -07:00
Li Shang
0ebf09a768
Merge pull request #639 from kitematic/bigger-font
...
Larger font and circular button alignment fix
2015-06-15 13:33:20 -07:00
Andrea Luzzardi
f8cb3695e6
Merge pull request #947 from moxiegirl/test-tooling
...
New documentation tooling for Hugo work
2015-06-15 13:27:53 -07:00
Mary Anthony
f93fee5f48
retooling for hugo
...
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-15 13:19:38 -07:00
Evan Hazlett
4b2cd762a5
Merge pull request #1360 from ehazlett/update-rpms
...
provisioning: update rpms for RC3
2015-06-15 16:18:34 -04:00
Evan Hazlett
e37e90939b
provisioning: update rpms for RC3
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-06-15 16:16:16 -04:00
Sean Li
6614c79951
Larger font and circular button alignment.
2015-06-15 13:13:51 -07:00
Evan Hazlett
c109623207
Merge pull request #1349 from nathanleclaire/wonky_start_ip
...
Fix error from not being able to find IP on Virtualbox start
2015-06-15 16:12:18 -04:00
Madhu Venugopal
dcc4a14ba3
Picking up missed out vendor files via hack/vendor.sh
...
while wokring on another PR, I noticed that hack/vendor.sh was picking
up unrelated files. Maybe a previous update to the hack/vendor.sh failed
to run the script and push the vendor changes ?
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-15 11:38:06 -07:00
Ahmet Alp Balkan
00a2988d0d
Fix typo in leadership/README.md
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-06-15 11:31:34 -07:00
Michael Crosby
3f11e05db2
Merge pull request #13942 from calavera/fix_unshare_mount_regression
...
Fix regression bind mounting shared.
2015-06-15 11:25:35 -07:00
Aanand Prasad
f353d9fbc0
Merge pull request #1406 from vdemeester/667-compose-port-scale
...
Fixing docker-compose port with scale (#667 )
(cherry picked from commit 5b2a0cc73d )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-06-15 11:22:08 -07:00
Daniel Nephin
09018855ce
Merge pull request #1550 from aanand/update-docker-py
...
Update setup.py with new docker-py minimum
(cherry picked from commit b3b44b8e4c )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-06-15 11:22:08 -07:00
Aanand Prasad
719954b02f
Merge pull request #1545 from moxiegirl/test-tooling
...
Updated for new documentation tooling
(cherry picked from commit aaccd12d3d )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-06-15 11:22:08 -07:00
Daniel Nephin
67bc3fabe4
Merge pull request #1544 from aanand/fix-volume-deduping
...
Fix volume binds de-duplication
(cherry picked from commit 77e594dc94 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-06-15 11:22:08 -07:00
Daniel Nephin
e724a346c7
Merge pull request #1526 from aanand/remove-start-or-create-containers
...
Remove Service.start_or_create_containers()
(cherry picked from commit 38a11c4c28 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-06-15 11:22:08 -07:00
Daniel Nephin
87b4545b44
Merge pull request #1508 from thaJeztah/update-dockerproject-links
...
Update dockerproject.com links
(cherry picked from commit 417e6ce0c9 )
2015-06-15 11:22:07 -07:00
Aanand Prasad
58a7844129
Merge pull request #1482 from bfirsh/add-build-and-dist-to-dockerignore
...
Make it possible to run tests remotely
(cherry picked from commit c8e096e089 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-06-15 11:22:07 -07:00
Daniel Nephin
4353f7b9f9
Merge pull request #1475 from fordhurley/patch-1
...
Fix markdown formatting for `--service-ports` example
(cherry picked from commit d64bf88e26 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-06-15 11:22:07 -07:00