Merge lp://staging/~zeller-benjamin/ubuntu-sdk-tools/vendor into lp://staging/ubuntu-sdk-tools
Proposed by
Benjamin Zeller
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 32 |
Merged at revision: | 29 |
Proposed branch: | lp://staging/~zeller-benjamin/ubuntu-sdk-tools/vendor |
Merge into: | lp://staging/ubuntu-sdk-tools |
Diff against target: |
20865 lines (+20419/-6) 81 files modified
Godeps/Godeps.json (+39/-0) Godeps/Readme (+5/-0) debian/changelog (+11/-2) debian/control (+5/-4) debian/copyright (+122/-0) debian/rules (+2/-0) vendor/github.com/gorilla/websocket/.gitignore (+22/-0) vendor/github.com/gorilla/websocket/.travis.yml (+20/-0) vendor/github.com/gorilla/websocket/AUTHORS (+8/-0) vendor/github.com/gorilla/websocket/LICENSE (+22/-0) vendor/github.com/gorilla/websocket/README.md (+61/-0) vendor/github.com/gorilla/websocket/client.go (+350/-0) vendor/github.com/gorilla/websocket/conn.go (+915/-0) vendor/github.com/gorilla/websocket/doc.go (+152/-0) vendor/github.com/gorilla/websocket/json.go (+55/-0) vendor/github.com/gorilla/websocket/server.go (+260/-0) vendor/github.com/gorilla/websocket/util.go (+44/-0) vendor/github.com/lxc/lxd/.gitignore (+12/-0) vendor/github.com/lxc/lxd/.travis.yml (+24/-0) vendor/github.com/lxc/lxd/AUTHORS (+5/-0) vendor/github.com/lxc/lxd/CONTRIBUTING.md (+72/-0) vendor/github.com/lxc/lxd/COPYING (+202/-0) vendor/github.com/lxc/lxd/Makefile (+97/-0) vendor/github.com/lxc/lxd/README.md (+336/-0) vendor/github.com/lxc/lxd/Vagrantfile (+14/-0) vendor/github.com/lxc/lxd/client.go (+2432/-0) vendor/github.com/lxc/lxd/config.go (+169/-0) vendor/github.com/lxc/lxd/shared/architectures.go (+107/-0) vendor/github.com/lxc/lxd/shared/architectures_linux.go (+24/-0) vendor/github.com/lxc/lxd/shared/architectures_others.go (+7/-0) vendor/github.com/lxc/lxd/shared/cert.go (+205/-0) vendor/github.com/lxc/lxd/shared/container.go (+141/-0) vendor/github.com/lxc/lxd/shared/devices.go (+164/-0) vendor/github.com/lxc/lxd/shared/flex.go (+14/-0) vendor/github.com/lxc/lxd/shared/gnuflag/flag.go (+895/-0) vendor/github.com/lxc/lxd/shared/idmapset_linux.go (+389/-0) vendor/github.com/lxc/lxd/shared/image.go (+64/-0) vendor/github.com/lxc/lxd/shared/json.go (+61/-0) vendor/github.com/lxc/lxd/shared/log.go (+51/-0) vendor/github.com/lxc/lxd/shared/network.go (+287/-0) vendor/github.com/lxc/lxd/shared/operation.go (+25/-0) vendor/github.com/lxc/lxd/shared/proxy.go (+162/-0) vendor/github.com/lxc/lxd/shared/server.go (+37/-0) vendor/github.com/lxc/lxd/shared/simplestreams.go (+641/-0) vendor/github.com/lxc/lxd/shared/status.go (+68/-0) vendor/github.com/lxc/lxd/shared/stringset.go (+24/-0) vendor/github.com/lxc/lxd/shared/util.go (+740/-0) vendor/github.com/lxc/lxd/shared/util_linux.go (+386/-0) vendor/github.com/pborman/uuid/.travis.yml (+10/-0) vendor/github.com/pborman/uuid/CONTRIBUTING.md (+10/-0) vendor/github.com/pborman/uuid/CONTRIBUTORS (+1/-0) vendor/github.com/pborman/uuid/LICENSE (+27/-0) vendor/github.com/pborman/uuid/README.md (+13/-0) vendor/github.com/pborman/uuid/dce.go (+84/-0) vendor/github.com/pborman/uuid/doc.go (+8/-0) vendor/github.com/pborman/uuid/hash.go (+53/-0) vendor/github.com/pborman/uuid/json.go (+34/-0) vendor/github.com/pborman/uuid/node.go (+117/-0) vendor/github.com/pborman/uuid/sql.go (+66/-0) vendor/github.com/pborman/uuid/time.go (+132/-0) vendor/github.com/pborman/uuid/util.go (+43/-0) vendor/github.com/pborman/uuid/uuid.go (+201/-0) vendor/github.com/pborman/uuid/version1.go (+41/-0) vendor/github.com/pborman/uuid/version4.go (+25/-0) vendor/gopkg.in/yaml.v2/.travis.yml (+9/-0) vendor/gopkg.in/yaml.v2/LICENSE (+188/-0) vendor/gopkg.in/yaml.v2/LICENSE.libyaml (+31/-0) vendor/gopkg.in/yaml.v2/README.md (+131/-0) vendor/gopkg.in/yaml.v2/apic.go (+742/-0) vendor/gopkg.in/yaml.v2/decode.go (+683/-0) vendor/gopkg.in/yaml.v2/emitterc.go (+1685/-0) vendor/gopkg.in/yaml.v2/encode.go (+306/-0) vendor/gopkg.in/yaml.v2/parserc.go (+1096/-0) vendor/gopkg.in/yaml.v2/readerc.go (+394/-0) vendor/gopkg.in/yaml.v2/resolve.go (+203/-0) vendor/gopkg.in/yaml.v2/scannerc.go (+2710/-0) vendor/gopkg.in/yaml.v2/sorter.go (+104/-0) vendor/gopkg.in/yaml.v2/writerc.go (+89/-0) vendor/gopkg.in/yaml.v2/yaml.go (+346/-0) vendor/gopkg.in/yaml.v2/yamlh.go (+716/-0) vendor/gopkg.in/yaml.v2/yamlprivateh.go (+173/-0) |
To merge this branch: | bzr merge lp://staging/~zeller-benjamin/ubuntu-sdk-tools/vendor |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zoltan Balogh | Approve | ||
Review via email:
|
Commit message
Ship dependencies in vendor subdir
Description of the change
Ship dependencies in vendor subdir
To post a comment you must log in.