Ken Pepple
be6dcc0905
fixes issue #831 and issue #771 by checking for unset active machine name
...
Signed-off-by: Ken Pepple <ken@solinea.com >
2015-03-25 13:46:46 -07:00
Richard
78562258b2
Log invalid remote IPs
2015-03-25 13:44:16 -07:00
Stephen Day
e9c69ffe14
Merge pull request #293 from stevvooe/log-formatter-configuration
...
main, configuration, doc: allow logging formatter to be configured
2015-03-25 13:34:42 -07:00
Evan Hazlett
87f12c3a5c
Merge pull request #873 from slashk/issue-843-vb-flags
...
add integration tests for virtualbox to exercise custom options
2015-03-25 12:55:22 -07:00
Ken Pepple
a84cc1ee6b
add integration tests for custom create options in virtualbox
...
Signed-off-by: Ken Pepple <ken@solinea.com >
2015-03-25 12:48:50 -07: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
Ankush Agarwal
161c2e5e74
Rename Fds to File Descriptors in docker info
...
This makes the docker info more readable. Also change a log line
in a test file renaming Fds
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-03-25 12:04:15 -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
Alexandre Beslic
ca245c6ad3
Move note on top of Nodes config to avoid confusion
...
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com >
2015-03-25 11:34:11 -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
Victor Vieux
ff5342f76d
Merge pull request #324 from chanwit/doc-setup-godep
...
Cleanup: add docker build to README and CONTRIBUTING to cover godep
2015-03-25 12:23:30 -06:00
Nathan LeClaire
abc5462c77
Rename migration functions to be more descriptive and add tests
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-03-25 11:21:09 -07:00
Richard
e21a425f88
Verify IP addresses
...
Fix lint errors
Add more test
2015-03-25 11:11:46 -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
Ben Firshman
e1b27acd02
Add contributing section to readme
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-03-25 17:22:04 +01: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
Ben Firshman
9aab7bc242
Merge pull request #1172 from aanand/fix-dns
...
Fix regression in Dns and DnsSearch settings
2015-03-25 16:11:13 +00: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
Jeffrey Morgan
25773a40f1
Merge pull request #329 from domderen/deps_load_fix
...
A fix required to load only one instance of React in the application.
2015-03-25 11:47:08 -04: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
Srini Brahmaroutu
be5de5bcb8
Fix the events, pull test to use v2 local server
...
Closes #10964
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-03-25 15:12:47 +00: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
Chanwit Kaewkasi
5333b84529
tweak workflow for godep update
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-03-25 20:18:02 +07:00
Chanwit Kaewkasi
e991c930d3
update godep save to also work with test dependencies
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-03-25 20:18:01 +07:00
Chanwit Kaewkasi
3783016c66
clarify dev workflow
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-03-25 20:17:59 +07:00
Chanwit Kaewkasi
951ac91a75
added message to warn about carefully godep save
...
Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com >
2015-03-25 20:17:44 +07:00
Simon Thulbourn
c8f3800f1c
Add client certificate CA option to authenticate with client certs
...
Add the ability to authenticate against multiple client CA certificates.
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com >
2015-03-25 10:53:03 +00:00
Evan Hazlett
5575c6dc9d
Merge pull request #805 from ehazlett/file-support-for-b2d
...
File support for b2d
2015-03-25 02:53: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