Merge pull request #63 from IBM/merge_dev_into_master

Ubiquity k8s POC v0.4.0
IBM · Aug 30, 2017 · b316e28 · b316e28
2 parents 6ea6291 + 9e1341f
commit b316e28
Show file tree

Hide file tree

Showing 15,317 changed files with 2,823 additions and 4,837,703 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 *.o
 *.a
 *.so
+glide.lock
 
 tmp/*
 
@@ -11,6 +12,7 @@ bin/*
 gobin/*
 
 # Folders
+vendor
 _obj
 _test
 .idea

diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ go:
   - 1.7
 
 install:
+  - sh scripts/run_glide_up
   - sh scripts/build_flex_driver
   - sh scripts/build_provisioner
 

diff --git a/README.md b/README.md
diff --git a/cli.go b/cli.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     *.o
     *.a
     *.so
+    glide.lock
     tmp/*
@@ Expand All / @@ -11,6 +12,7 @@ bin/* @@
     gobin/*
     # Folders
+    vendor
     _obj
     _test
     .idea
@@ Expand Down @@