Commit Graph

558 Commits

Author SHA1 Message Date
Vish Kannan
1ed9d122c1 Merge pull request #220 from vmarmol/coreos
Fix name resolution in Systemd systems
2014-09-29 11:28:23 -07:00
Victor Marmol
79398a724b Merge pull request #259 from blakelapierre/typo
Typo
2014-09-29 08:25:54 -07:00
Blake La Pierre
071298109a Typo 2014-09-29 00:46:36 -07:00
Victor Marmol
5ebd3265a5 Merge pull request #256 from satnam6502/master
Change the interface of CanHandle to return error information.
2014-09-28 11:19:05 -07:00
Satnam Singh
1268de355e Merge branch 'master' of github.com:satnam6502/cadvisor 2014-09-26 18:07:24 -07:00
Satnam Singh
7ddc75c41b Squashed commit of the following:
commit 6bf9fe89f6
Author: Satnam Singh <satnam@google.com>
Date:   Fri Sep 26 10:23:16 2014 -0700

    Change error to warning during handling check.

commit c580907183
Author: Satnam Singh <satnam@google.com>
Date:   Fri Sep 26 10:21:41 2014 -0700

    Decapatalise fmt.Errorf error messages.

commit 3ecc5745d6
Author: Satnam Singh <satnam@google.com>
Date:   Fri Sep 26 10:19:15 2014 -0700

    Fix misunderstanding about when CanHandle fails.

commit adce0c5433
Author: Satnam Singh <satnam@google.com>
Date:   Fri Sep 26 10:13:32 2014 -0700

    Change the interface of CanHandle to return error information.
2014-09-26 18:06:58 -07:00
Rohit Jnagal
683fb11c93 Merge pull request #257 from vmarmol/travis
Remove build from Travis install.
2014-09-26 14:29:51 -07:00
Victor Marmol
76234e5c67 No-op for install 2014-09-26 14:21:31 -07:00
Victor Marmol
930492b815 Remove build from Travis install.
Also remove unused deps.
2014-09-26 14:16:27 -07:00
Satnam Singh
6bf9fe89f6 Change error to warning during handling check. 2014-09-26 10:23:16 -07:00
Satnam Singh
c580907183 Decapatalise fmt.Errorf error messages. 2014-09-26 10:21:41 -07:00
Satnam Singh
3ecc5745d6 Fix misunderstanding about when CanHandle fails. 2014-09-26 10:19:15 -07:00
Satnam Singh
adce0c5433 Change the interface of CanHandle to return error information. 2014-09-26 10:13:32 -07:00
Victor Marmol
797a4986ff Merge pull request #252 from satnam6502/master
A few minor Go style suggestions.
2014-09-24 11:46:58 -07:00
Satnam Singh
bdcaa50b7f Merge branch 'master' of github.com:satnam6502/cadvisor
Conflicts:
	manager/manager.go
2014-09-24 11:09:50 -07:00
Satnam Singh
833feae28b Fix assignment error in haste. 2014-09-24 11:07:48 -07:00
Satnam Singh
1a9d2298dc And yet another if. 2014-09-24 11:07:48 -07:00
Satnam Singh
f3c92c381a More if undos. 2014-09-24 11:07:48 -07:00
Satnam Singh
1bdbb73c0e And a few more capatalization undos. 2014-09-24 11:07:48 -07:00
Satnam Singh
3f45b35768 Undo changed to Errorf in manager.go re: capatalization. 2014-09-24 10:59:18 -07:00
Satnam Singh
8551d376d8 Undo changes to if statements as requested by vmarmol. Fix typos in my changes. 2014-09-24 10:59:18 -07:00
Satnam Singh
bae82a583d A few minor Go style suggestions. 2014-09-24 10:53:52 -07:00
Victor Marmol
06e49ad1c4 Merge pull request #255 from vishh/update_deps
Updating libcontainer dependency.
2014-09-24 10:52:03 -07:00
Vishnu Kannan
607a41936f Updating libcontainer dependency. 2014-09-24 17:45:04 +00:00
Satnam Singh
4d86f8d931 Fix assignment error in haste. 2014-09-24 10:29:04 -07:00
Satnam Singh
b77bc54f5d And yet another if. 2014-09-24 10:26:53 -07:00
Satnam Singh
9ccf15fcf9 More if undos. 2014-09-24 10:22:13 -07:00
Satnam Singh
db1a8ec47a And a few more capatalization undos. 2014-09-24 10:16:05 -07:00
Satnam Singh
b4a7df6044 Undo changed to Errorf in manager.go re: capatalization. 2014-09-24 10:15:08 -07:00
Satnam Singh
cab052cc8a Undo changes to if statements as requested by vmarmol. Fix typos in my changes. 2014-09-24 10:03:56 -07:00
Victor Marmol
ebf231e4df Fix name resolution in Systemd systems 2014-09-23 20:01:35 -07:00
Vish Kannan
9f3c99fe4a Merge pull request #253 from vmarmol/shutdown
Also handle SIGTERM.
2014-09-23 14:55:04 -07:00
Victor Marmol
6393bfbd40 Also handle SIGTERM. 2014-09-23 14:49:36 -07:00
Rohit Jnagal
932d2a6959 Merge pull request #251 from vmarmol/shutdown
Supporting graceful signal shutdown.
2014-09-23 14:28:39 -07:00
Victor Marmol
6f35cf8e6c Supporting graceful signal shutdown.
Adding a signal handler and gracefully shutting down all threads.
2014-09-23 14:13:58 -07:00
Victor Marmol
be6a7ab917 Merge pull request #250 from plietar/master
Bump go-dockerclient.
2014-09-23 14:07:55 -07:00
Satnam Singh
f097c2b4ab A few minor Go style suggestions. 2014-09-23 11:58:44 -07:00
Paul Liétar
3956f6ce4d Bump go-dockerclient. 2014-09-23 16:32:13 +02:00
Victor Marmol
1cbf0bc910 Merge pull request #248 from satnam6502/master
Some Go style suggestions for client.go and client_test.go
2014-09-22 17:50:10 -07:00
Victor Marmol
e929ffd846 Merge pull request #247 from rjnagal/diskio
Add diskio stats to cAdvisor.
2014-09-22 17:40:31 -07:00
Satnam Singh
fde48d5124 Fix yet another typo in the comment for TestGetMachineInfo. 2014-09-22 16:39:28 -07:00
Satnam Singh
6259778f75 Fix typo for comment on TestGetMachineInfo. 2014-09-22 16:32:44 -07:00
Satnam Singh
6daa23d9a3 Some Go style suggestions for client.go and client_test.go 2014-09-22 16:25:06 -07:00
Rohit Jnagal
6aee4c03b0 Flatten diskio stats and use struct key.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
2014-09-22 23:24:34 +00:00
Rohit Jnagal
9a76da9993 Add diskio stats to cAdvisor.
Docker-DCO-1.1-Signed-off-by: Rohit Jnagal <jnagal@google.com> (github: rjnagal)
2014-09-22 22:48:59 +00:00
Vish Kannan
7663955763 Merge pull request #246 from satnam6502/master
Fix a minor typo in the README.md file.
2014-09-22 15:28:48 -07:00
Satnam Singh
87768a047c Minor Go-style suggeston: move decode and error assignment into if clause check. 2014-09-22 15:21:06 -07:00
Satnam Singh
eb54622568 Fix a minor typo in the README.md file. 2014-09-22 14:41:54 -07:00
Vish Kannan
195772a1bc Merge pull request #245 from vmarmol/tests
Refactor and dependency inject containerData deps
2014-09-22 10:39:55 -07:00
Vish Kannan
bcd8c98bbc Merge pull request #242 from vmarmol/flat-spec
Flatten ContainerSpec.
2014-09-22 10:35:57 -07:00