Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

This commit is contained in:
obscuren 2015-02-17 16:09:25 +01:00
commit 815ead7107

View File

@ -44,8 +44,10 @@ func (l *P2PConnecting) EventName() string {
} }
type P2PConnected struct { type P2PConnected struct {
NumConnections int `json:"num_connections"` RemoteId string `json:"remote_id"`
RemoteId string `json:"remote_id"` RemoteAddress string `json:"remote_addr"`
RemoteVersionString string `json:"remote_version_string"`
NumConnections int `json:"num_connections"`
LogEvent LogEvent
} }