23d80e7ccb
Merge pull request #11729 from icecrime/11048_carry
...
Carry #11048
Upstream-commit: 5f7e142c46574c473a3b9e9dee4ef3e956b6c645
Component: engine
2015-03-25 09:27:07 -07:00
38fb27e1f6
Merge pull request #11749 from duglin/FixLogin
...
Fix login
Upstream-commit: 9359e2bed349a7c406e90ac0b309d667872c837e
Component: engine
2015-03-25 09:22:52 -07:00
912f4efa7e
Merge pull request #11730 from runcom/11725-fix-volume-initialize-error-check
...
Fix volume initialize error check
Upstream-commit: bb65c808df825181250935c642270df220e554f7
Component: engine
2015-03-25 09:19:42 -07:00
217062d14b
Merge pull request #11533 from hqhq/hq_fix_decode
...
fix decode data loss when using int64 in json
Upstream-commit: 639d60b5380157c05d72682812ba879d84f70c4e
Component: engine
2015-03-25 10:17:10 -06:00
2f53de071f
Fix login
...
Right now it returns:
```
FATA[0001] json: Unmarshal(non-pointer types.AuthResponse)
```
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0d65069a175b08015147ecf57a93f7c16ad4e37c
Component: engine
2015-03-25 08:45:14 -07:00
8e0111a19d
Merge pull request #11737 from duglin/FixTestOutput
...
TestBuildCancelationKillsSleep sends exec cmd to stdout
Upstream-commit: f08e9f44a9d27dfd3780e8c3d89b0236f7672688
Component: engine
2015-03-25 08:45:09 -07:00
68a14edc61
Fix volume initialize error check, Fixes #11725
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 1d1230ea32544bcc646a5b79ddf9cc66b70c66cd
Component: engine
2015-03-25 16:36:00 +01:00
2e05bc553e
Merge pull request #11741 from aneshas/11720-redundant-else
...
Fixed redundant else in GetDeviceStatus
Upstream-commit: 3bed92a7bfcfb404b883339c973ee3833c239e9e
Component: engine
2015-03-25 08:28:38 -07:00
9bc92efdf4
Merge pull request #11735 from Sirupsen/listenbuffer-promote
...
listenbuffer: add docs and test
Upstream-commit: 7c2cc476da6fcff4dd1304d41f9b67a0f4b309b7
Component: engine
2015-03-25 08:14:21 -07:00
8d4b28771e
Merge pull request #11715 from duglin/DocCliEnvVars
...
Add some info about what environment variables are available
Upstream-commit: dea660874ca3008af5c326a193ae5c657fefb30d
Component: engine
2015-03-25 07:29:27 -07:00
dc0bb844c3
Merge pull request #11694 from hqhq/hq_add_memsw_example
...
docs: add memory and swap memory usage examples
Upstream-commit: 67eb10defe0617c3dbb563002474e8e85b97b7bb
Component: engine
2015-03-25 07:01:44 -07:00
ac917d33bd
Fixed redundant else in GetDeviceStatus
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
Upstream-commit: e479e1c9f7d327f396eebc46d446cf4ee34513f7
Component: engine
2015-03-25 09:53:04 +01:00
5788e16941
Merge pull request #11738 from joeygibson/11610-split
...
api/client - The code for all cli commands are in one file #11610
Upstream-commit: 65584318d2fabc819e35e10fe5f2724fd6e076b0
Component: engine
2015-03-25 00:48:50 -04:00
944966da9a
fix 2 integration tests on lxc
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: c959d26d2f413fa93b60174c4e19111eff0a845d
Component: engine
2015-03-24 21:12:16 -07:00
2031fb16f5
Get rid of panic in stats for lxc
...
Fix containers dir
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7dce9024947e6d573fc5ad0e2151e07c204c474c
Component: engine
2015-03-24 21:12:06 -07:00
ff6913868d
api/client - The code for all cli commands are in one file #11610
...
Signed-off-by: Joey Gibson <joey@joeygibson.com >
Upstream-commit: 58690c9cca5995035b721ed6f1337b0ddb932d7a
Component: engine
2015-03-24 23:57:23 -04:00
5e050af7a5
TestBuildCancelationKillsSleep send exec cmd to stdout
...
and makes the testing output ugly.
This hides the output since it not used.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: fbd47969a86793c4e87e2da1abea1f806ba0a526
Component: engine
2015-03-24 20:56:26 -07:00
04fe859915
listenbuffer: add docs
...
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com >
Upstream-commit: 67bd859481a9d5c7a2ccf4c593e65d473ab3f106
Component: engine
2015-03-25 03:11:34 +00:00
6eeff65133
listenbuffer: add test
...
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com >
Upstream-commit: b6b8032a1759905adbb68355e994b0405054bcc0
Component: engine
2015-03-25 03:11:33 +00:00
9d47ebbe4f
Add some info about what environment variables are available
...
Having the list in one spot makes it easier for people to see what's
avaiable instead of having to scan all of the docs and extract the info.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0d2190e6794df81f3cf3b84707ce3abdf5843100
Component: engine
2015-03-24 18:29:21 -07:00
9709821e24
Merge pull request #10527 from mfojtik/lxc_11
...
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
Upstream-commit: 22dba32b4dab6cec7b7a2d6dffa94a5fe713c2d3
Component: engine
2015-03-24 17:37:27 -07:00
1da629c7e0
Merge pull request #11018 from delftswa2014/10958-pidfile
...
Moves pid file operations to /pkg/
Upstream-commit: d214e640321ffe318fb3b89bdc55320549a7e4ae
Component: engine
2015-03-24 17:20:52 -07:00
11fbf94cfd
Revert all but TestPullImageFromCentralRegistry changes
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 8900ae2928cea8f4b5d52ff68253cad2504edd6c
Component: engine
2015-03-24 16:27:35 -07:00
9a660a7843
Merge pull request #11728 from crosbymichael/lxc-mkdir
...
Mkdir for lxc root dir before setup of symlink
Upstream-commit: aecc5b606f7243dce7bb68bd8c94327198be02ea
Component: engine
2015-03-24 16:25:12 -07:00
d00e59a1a0
Merge pull request #10681 from noironetworks/whitespaces-cleaner
...
Removed all trailing whitespaces from every text file
Upstream-commit: 322095ed63ec0943378485f8f8d4cabcfd471875
Component: engine
2015-03-24 16:02:14 -07:00
e0fdaa87e8
Moved pidfile from utils to pkg
...
Fixes #10958 by moving utils.daemon to pkg.pidfile.
Test cases were also added.
Updated the daemon to use the new pidfile.
Signed-off-by: Rick Wieman <git@rickw.nl >
Upstream-commit: 772833274fd84b3c960ccab14258b7e5a00b18cd
Component: engine
2015-03-24 23:59:32 +01:00
08138d304c
Mkdir for lxc root dir before setup of symlink
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 246cab90f216e68c25178ffd19756ab864b809d0
Component: engine
2015-03-24 15:53:23 -07:00
d5ac91b394
Merge pull request #11716 from LK4D4/root_in_run
...
Use /var/run/docker as root for execdriver
Upstream-commit: f3fc857e018dc919fddfea645b8308379343cb4e
Component: engine
2015-03-24 14:58:30 -07:00
b486c71c0f
Merge pull request #11651 from vbatts/vbatts-dont_rm_dockerversion
...
make.sh: leave around the generated version
Upstream-commit: 46be6bb4033a5a4be9b10ab960f74641a8d79f32
Component: engine
2015-03-24 14:47:42 -07:00
c081961ccf
Merge pull request #11726 from noxiouz/history-swap-parallel-assignment
...
History.Swap Use parallel assignment to swap elements
Upstream-commit: 979283a166126f3849102f98f1a2577ddc240b19
Component: engine
2015-03-24 14:43:44 -07:00
2ae56c859a
Merge pull request #11679 from avidas/api-common-constants-document
...
Add comments to api/common constants
Upstream-commit: 73dab8205a77320d728d5d77880b2e1109d07a67
Component: engine
2015-03-24 14:43:09 -07:00
82a679e32d
Merge pull request #11727 from tiborvass/carry-11441
...
Carry 11441: fix docker ps help message
Upstream-commit: a4e1de58a3019e7ab9e143af3243713f0e80fe15
Component: engine
2015-03-24 14:42:02 -07:00
d83a675d7e
fix docker ps help message
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
Upstream-commit: a153e80f72274c05589145011c16cc1d7f8ee75f
Component: engine
2015-03-24 15:33:53 -06:00
f0be9c4403
History.Swap Use parallel assignment to swap elements, as it's
...
a more idiomatic way for golang than using a temp variable.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: fc325274e84a0c16b758e3d6b121c9af1150cce2
Component: engine
2015-03-25 00:13:13 +03:00
63a73186e0
Merge pull request #11713 from icecrime/update_gitignore
...
Update .gitignore
Upstream-commit: 46321a1e4fd96fe9646ed62d3c6dfb1168933044
Component: engine
2015-03-24 14:03:31 -07:00
cd0df47776
Merge pull request #11712 from 4gh/test_httputils
...
add tests for pkg/httputils
Upstream-commit: 439e0ab23f57f61ac8fcb1796dfc489a4305e2be
Component: engine
2015-03-24 13:56:31 -07:00
80a1056333
Merge pull request #11663 from arthurbarr/master
...
Fix #11589 by adding README and comments to exported functions
Upstream-commit: 28b96cc61357d03cca8d93cd8f27bb5fc0247c2b
Component: engine
2015-03-24 14:45:05 -06:00
02a1b68a98
Merge pull request #11417 from rhatdan/btrfs
...
Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version
Upstream-commit: 8fc9e400866456d72727afb9f8ea3a23abc4282e
Component: engine
2015-03-24 16:00:15 -04:00
6c54305281
Merge pull request #10283 from rhatdan/dev
...
We want to allow the sharing of /dev from the host into the container.
Upstream-commit: 131b29f7bc003ab6e6fc1d4e06fcf6764f4f7e6d
Component: engine
2015-03-24 12:57:44 -07:00
558349d8ce
Merge pull request #11689 from calavera/ipallocator_refactor
...
Use a structure to keep the allocated ips pool.
Upstream-commit: f7900cdd67e71a418d3cbfeb1b23315c5be78bdf
Component: engine
2015-03-24 12:42:30 -07:00
1e0e1eb7fb
Merge pull request #11717 from moxiegirl/tweaks-from-contributathon
...
Adding in comments from party
Upstream-commit: d20ba329d1cf2a0cb3a93bd69fc9e6247f338dcc
Component: engine
2015-03-24 12:18:18 -07:00
85625e1ab5
Merge pull request #11709 from paulbellamy/11626-portallocator
...
Refactor global portallocator and portmapper state
Upstream-commit: ce372cd6642ff0dd2de9eece489a847f088eb3bd
Component: engine
2015-03-24 13:51:00 -05:00
4e35bd8884
Merge pull request #11710 from runcom/11599-refactor-pkg-common
...
Refactor pkg/common, Fixes #11599
Upstream-commit: 8eee55a35c8161bde7bee50231b67f8e33dd16e0
Component: engine
2015-03-24 11:45:07 -07:00
0185f15317
Use a structure to keep the allocated ips pool.
...
Fixes #11624 .
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7e95b13460a58db75630d2d795482f39c68762c2
Component: engine
2015-03-24 11:41:44 -07:00
0b59de6c55
Adding in comments from party
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 6de806f348cf802e80a729f390bab777df146ca7
Component: engine
2015-03-24 11:25:26 -07:00
8d8bb83013
Merge branch 'master' of github.com:docker/docker into btrfs
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 25c4a923424bdc659cdb18239290196272d17423
Component: engine
2015-03-24 14:14:54 -04:00
a6001c7df9
Use /var/run/docker as root for execdriver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1e788ec9855058913de6ac8a2be7acee0f001954
Component: engine
2015-03-24 10:47:30 -07:00
0e96e605fc
Fix #11589 by adding README and comments to exported functions
...
Signed-off-by: Arthur Barr <arthur.barr@uk.ibm.com >
Upstream-commit: 557cca536f82a25f110399fcd2964e07f5d51dcf
Component: engine
2015-03-24 17:30:19 +00:00
1e47557825
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: b80fae735684406d848b16a0f148a746e17ed25f
Component: engine
2015-03-24 18:19:59 +01:00
04b5dbec35
Sort .gitignore content
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 4433b4c19e7eb63937e211cc0684560800799e68
Component: engine
2015-03-24 09:40:07 -07:00
