Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add load balancing support to services. #135

Merged
merged 9 commits into from
Jun 18, 2014
Merged

Add load balancing support to services. #135

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b1531bb
bump(github.com/coreos/go-etcd/etcd): 7745cfd7f8e619cc9e6be450238e625…
brendandburns Jun 16, 2014
5d2eb7d
bump(github.com/fsouza/go-dockerclient): a735a3dbbfdd1822886f6b423531…
brendandburns Jun 16, 2014
48e246c
bump(code.google.com/p/goauth2/oauth): cf9c96faa9885b8cf351c2d79d9a92…
brendandburns Jun 16, 2014
f7f449f
bump(code.google.com/p/google-api-go-client/compute/v1): 2d8543b9e701…
brendandburns Jun 16, 2014
dd44261
bump(gopkg.in/v1/yaml): b0c168ac0cf9493da1f9bb76c34b26ffef940b4a
brendandburns Jun 16, 2014
721f657
bump(code.google.com/p/google-api-go-client/googleapi): cdde2f903343c…
brendandburns Jun 16, 2014
45397c4
bump(code.google.com/p/goauth2/compute/serviceaccount): ef170e7cf161b…
brendandburns Jun 17, 2014
23e736c
Added goauth2 and the google api client.
brendandburns Jun 17, 2014
2759b23
Add load balancing support to services.
brendandburns Jun 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bump(gopkg.in/v1/yaml): b0c168ac0cf9493da1f9bb76c34b26ffef940b4a
  • Loading branch information
@brendandburns
brendandburns committed Jun 17, 2014
commit dd44261adfbef71b7faf928a00c61900d708afae
11 changes: 6 additions & 5 deletions third_party/src/gopkg.in/v1/yaml/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,27 +72,27 @@ type T struct {

func main() {
t := T{}

err := yaml.Unmarshal([]byte(data), &t)
if err != nil {
log.Fatalf("error: %v", err)
}
fmt.Printf("--- t:\n%v\n\n", t)

d, err := yaml.Marshal(&t)
if err != nil {
log.Fatalf("error: %v", err)
}
fmt.Printf("--- t dump:\n%s\n\n", string(d))

m := make(map[interface{}]interface{})

err = yaml.Unmarshal([]byte(data), &m)
if err != nil {
log.Fatalf("error: %v", err)
}
fmt.Printf("--- m:\n%v\n\n", m)

d, err = yaml.Marshal(&m)
if err != nil {
log.Fatalf("error: %v", err)
Expand Down Expand Up @@ -125,3 +125,4 @@ b:
- 3
- 4
```

2 changes: 1 addition & 1 deletion third_party/src/gopkg.in/v1/yaml/decode_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ longTag:
label: center/big

inlineMap:
# Inlined map
# Inlined map
<< : {"x": 1, "y": 2, "r": 10}
label: center/big

Expand Down