Merge branch 'master' of github.com:rightscale/rsc into auth-redirect

flexera-public · Mar 20, 2015 · 7d59e8b · 7d59e8b
2 parents afcaa8a + a326d63
commit 7d59e8b
Show file tree

Hide file tree

Showing 210 changed files with 6,198 additions and 1,878 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,9 @@ tags
 rsc
 gen/api15gen/api15gen
 gen/praxisgen/praxisgen
+*.exe
 *.coverprofile
-Godeps/_workspace/src/github.com/jessevdk/go-flags/
-Godeps/_workspace/src/github.com/rlmcpherson/s3gof3r/
-Godeps/_workspace/src/golang.org/x/tools/
+build
+Godeps/_workspace/src/github.com/jessevdk/
+Godeps/_workspace/src/github.com/rlmcpherson/
+Godeps/_workspace/src/golang.org/
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ install:
   - export PATH=$PATH:$HOME/gopath/bin # travis' worker doesn't seem to do this consistently
   - (cd $GOROOT/src && GOOS=darwin GOARCH=amd64 ./make.bash --no-clean)
   - (cd $GOROOT/src && GOOS=linux GOARCH=arm ./make.bash --no-clean)
-    #- (cd $GOROOT/src && GOOS=windows GOARCH=amd64 ./make.bash --no-clean)
+  - (cd $GOROOT/src && GOOS=windows GOARCH=amd64 ./make.bash --no-clean)
   - make depend
 
 before_script: make build

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/kr/text/License b/Godeps/_workspace/src/github.com/kr/text/License
diff --git a/Godeps/_workspace/src/github.com/kr/text/Readme b/Godeps/_workspace/src/github.com/kr/text/Readme
diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme b/Godeps/_workspace/src/github.com/kr/text/colwriter/Readme
diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go b/Godeps/_workspace/src/github.com/kr/text/colwriter/column.go
diff --git a/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go b/Godeps/_workspace/src/github.com/kr/text/colwriter/column_test.go
diff --git a/Godeps/_workspace/src/github.com/kr/text/doc.go b/Godeps/_workspace/src/github.com/kr/text/doc.go
diff --git a/Godeps/_workspace/src/github.com/kr/text/indent.go b/Godeps/_workspace/src/github.com/kr/text/indent.go