beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
14130 commits 14 branches 412 tags 338 MiB
Commit graph

14130 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jessie Frazelle
8cd3564ec1 Merge pull request #11771 from aneshas/11719-redundant-elses 
Removed redundant elses
 2015-03-25 16:06:30 -07:00
Tibor Vass
8d62e12f4d Merge pull request #11745 from imdreamrunner/patch-1 
Add missing newline for bash code example
 2015-03-25 16:58:55 -06:00
Tibor Vass
136f8fa2ff Merge pull request #11774 from thaJeztah/fix-workdir-typo 
Fix typo "WRKDIR" -> "WORKDIR"
 2015-03-25 16:55:57 -06:00
Tibor Vass
87e877e3c1 Merge pull request #11748 from minimum2scp/fix/debootstrap 
removed unnecessary tabs from /usr/sbin/policy-rc.d, and /sbin/initctl for mkimage.sh debootstrap
 2015-03-25 16:55:13 -06:00
Sebastiaan van Stijn
6fdb583f38 Fix typo "WRKDIR" -> "WORKDIR" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-03-25 23:47:38 +01:00
Alexander Morozov
e6cbffe94b Merge pull request #11761 from runcom/11731-remove-engine-status 
Remove engine.Status, replace with standard go error
 2015-03-25 15:41:02 -07:00
Anes Hasicic
1b6065de8f Removed redundant elses 
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com>
 2015-03-25 23:34:00 +01:00
Antonio Murdaca
c79b9bab54 Remove engine.Status and replace it with standard go error 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-25 22:32:08 +01:00
Michael Crosby
3d9cbf0e71 Merge pull request #11758 from crosbymichael/update-libct-mar25 
Update libcontainer to a6044b701c166fe538fc760f9e2
 2015-03-25 12:17:33 -07:00
Arnaud Porterie
54a607a22d Merge pull request #11691 from matthewkmayer/feature-dont-create-bind-dirs 
Removes bind dir creation in daemon start.
 2015-03-25 11:44:13 -07:00
Jessie Frazelle
667df336b7 Merge pull request #11756 from vbatts/vbatts-remove_trailing_whitespaces 
.: remove trailing white spaces
 2015-03-25 11:36:10 -07:00
Michael Crosby
b4196f7892 Update libcontainer to a6044b701c166fe538fc760f9e2 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-25 11:32:14 -07:00
Jessie Frazelle
e6e2893fa3 Merge pull request #11753 from vbatts/vbatts-btrfs_ifdef_build_version 
btrfs: #ifdef for build version
 2015-03-25 11:25:49 -07:00
YAMADA Tsuyoshi
09165e0fe0 removed unnecessary tab from /usr/sbin/policy-rc.d, and /sbin/initctl 
Signed-off-by: YAMADA Tsuyoshi <tyamada@minimum2scp.org>
 2015-03-26 03:10:34 +09:00
Vincent Batts
b76e300b4c btrfs: #ifdef for build version 
We removed it, because upstream removed it. But now it will be coming
back, so work with it either way.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-03-25 13:56:51 -04:00
Vincent Batts
7617ec176d .: remove trailing white spaces 
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-03-25 13:38:17 -04:00
Xinzi Zhou
ed7907a988 Add missing newline for bash code example 
Signed-off-by: Zhou Xinzi <imdreamrunner@gmail.com>
 2015-03-26 01:24:00 +08:00
Doug Davis
a0cfe83435 Merge pull request #11751 from tiborvass/revert-validate-spaces 
Revert "Dealing with trailing whitespaces"
 2015-03-25 13:01:58 -04:00
Alexander Morozov
444c967aec Merge pull request #11750 from MabinGo/adjust_log_func_call 
Use appropriate func to record logs according to different scene
 2015-03-25 09:41:41 -07:00
Alexander Morozov
5f7e142c46 Merge pull request #11729 from icecrime/11048_carry 
Carry #11048
 2015-03-25 09:27:07 -07:00
Alexander Morozov
9359e2bed3 Merge pull request #11749 from duglin/FixLogin 
Fix login
 2015-03-25 09:22:52 -07:00
Brian Goff
bb65c808df Merge pull request #11730 from runcom/11725-fix-volume-initialize-error-check 
Fix volume initialize error check
 2015-03-25 09:19:42 -07:00
Tibor Vass
639d60b538 Merge pull request #11533 from hqhq/hq_fix_decode 
fix decode data loss when using int64 in json
 2015-03-25 10:17:10 -06:00
Tibor Vass
0252ad0adc Revert "Dealing with trailing whitespaces" 
The validation script from #10681 is too pedantic, and does not handle
well situations like:

```
cat <<EOF   # or <<-EOF
	Whether the leading whitespace is stripped out or not by bash
	it should still be considered as valid.
EOF
```

This reverts commit 4e65c1c319.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-03-25 10:04:56 -06:00
Doug Davis
0d65069a17 Fix login 
Right now it returns:
```
FATA[0001] json: Unmarshal(non-pointer types.AuthResponse)
```

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-25 08:45:14 -07:00
Alexander Morozov
f08e9f44a9 Merge pull request #11737 from duglin/FixTestOutput 
TestBuildCancelationKillsSleep sends exec cmd to stdout
 2015-03-25 08:45:09 -07:00
Antonio Murdaca
1d1230ea32 Fix volume initialize error check, Fixes #11725 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-25 16:36:00 +01:00
Mabin
b46beb170f Use appropriate function to record logs 
Signed-off-by: Mabin <bin.ma@huawei.com>
 2015-03-25 23:32:12 +08:00
Brian Goff
3bed92a7bf Merge pull request #11741 from aneshas/11720-redundant-else 
Fixed redundant else in GetDeviceStatus
 2015-03-25 08:28:38 -07:00
Brian Goff
7c2cc476da Merge pull request #11735 from Sirupsen/listenbuffer-promote 
listenbuffer: add docs and test
 2015-03-25 08:14:21 -07:00
moxiegirl
dea660874c Merge pull request #11715 from duglin/DocCliEnvVars 
Add some info about what environment variables are available
 2015-03-25 07:29:27 -07:00
moxiegirl
67eb10defe Merge pull request #11694 from hqhq/hq_add_memsw_example 
docs: add memory and swap memory usage examples
 2015-03-25 07:01:44 -07:00
Anes Hasicic
e479e1c9f7 Fixed redundant else in GetDeviceStatus 
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com>
 2015-03-25 09:53:04 +01:00
Doug Davis
65584318d2 Merge pull request #11738 from joeygibson/11610-split 
api/client - The code for all cli commands are in one file #11610
 2015-03-25 00:48:50 -04:00
Doug Davis
494c41519b Merge pull request #11733 from jfrazelle/fix-lxc 
Get rid of panic in stats/ fix dir lxc
 2015-03-25 00:41:11 -04:00
Jessica Frazelle
c959d26d2f fix 2 integration tests on lxc 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-24 21:12:16 -07:00
Jessica Frazelle
7dce902494 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)
 2015-03-24 21:12:06 -07:00
Joey Gibson
58690c9cca api/client - The code for all cli commands are in one file #11610 
Signed-off-by: Joey Gibson <joey@joeygibson.com>
 2015-03-24 23:57:23 -04:00
Doug Davis
fbd47969a8 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>
 2015-03-24 20:56:26 -07:00
Simon Eskildsen
67bd859481 listenbuffer: add docs 
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
 2015-03-25 03:11:34 +00:00
Simon Eskildsen
b6b8032a17 listenbuffer: add test 
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
 2015-03-25 03:11:33 +00:00
Doug Davis
0d2190e679 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>
 2015-03-24 18:29:21 -07:00
Jessie Frazelle
22dba32b4d Merge pull request #10527 from mfojtik/lxc_11 
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
 2015-03-24 17:37:27 -07:00
Michael Crosby
d214e64032 Merge pull request #11018 from delftswa2014/10958-pidfile 
Moves pid file operations to /pkg/
 2015-03-24 17:20:52 -07:00
Arnaud Porterie
8900ae2928 Revert all but TestPullImageFromCentralRegistry changes 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-24 16:27:35 -07:00
Jessie Frazelle
aecc5b606f Merge pull request #11728 from crosbymichael/lxc-mkdir 
Mkdir for lxc root dir before setup of symlink
 2015-03-24 16:25:12 -07:00
Arnaud Porterie
322095ed63 Merge pull request #10681 from noironetworks/whitespaces-cleaner 
Removed all trailing whitespaces from every text file
 2015-03-24 16:02:14 -07:00
Rick Wieman
772833274f 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>
 2015-03-24 23:59:32 +01:00
Michael Crosby
246cab90f2 Mkdir for lxc root dir before setup of symlink 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-24 15:53:23 -07:00
Michael Crosby
f3fc857e01 Merge pull request #11716 from LK4D4/root_in_run 
Use /var/run/docker as root for execdriver
 2015-03-24 14:58:30 -07:00