← Back to branch summary

~wallyworld/gwacl/fix-request-eof

~wallyworld/gwacl/fix-request-eof

Viewing all changes in revision 174.1.31.

Committer: Gavin Panella
Date: 2013-07-12 12:58:03 UTC
mfrom: (179 gwacl)
mto: This revision was merged to the branch mainline in revision 180.
Revision ID: gavin@gromper.net-20130712125803-zaffdjmzukqg9t4h

Merge trunk, resolving one conflict.

files modified:
deletedisk_test.go

httperror.go

httperror_test.go

management_base.go

management_base_test.go

management_test.go

names.go

names_test.go

poller.go

poller_test.go

x509dispatcher.go

x509dispatcher_test.go

x509session.go

x509session_test.go

xmlobjects.go

xmlobjects_test.go

Show diffs side-by-side

added added

removed removed

deletedisk_test.go

httperror_test.go

management_base.go

management_base_test.go

management_test.go

x509dispatcher.go

x509dispatcher_test.go

x509session_test.go

xmlobjects_test.go

Older »