Merge branch 'master' of github.com:Comcast/talaria

xmidt-org · Aug 31, 2017 · b6ce9d7 · b6ce9d7
2 parents d12d202 + 9803ac4
commit b6ce9d7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ before_install:
     - docker pull schmidtw/webpa.builder.centos6:latest
     - docker run -it -e BUILD_NUMBER=$TRAVIS_BUILD_NUMBER -d --name build schmidtw/webpa.builder.centos6 bash
     - env
+    - docker exec build rpm -q golang
     - docker exec build go version
     - docker exec build glide -v
     - docker exec build git clone https://github.com/Comcast/talaria.git

diff --git a/README.md b/README.md
@@ -24,4 +24,3 @@ rpm --import https://github.com/Comcast/talaria/releases/download/v0.0.1-65alpha
 ```
 yum install https://github.com/Comcast/talaria/releases/download/v0.0.1-65alpha/talaria-0.0.1-65.el6.x86_64.rpm
 ```
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,3 @@ rpm --import https://github.com/Comcast/talaria/releases/download/v0.0.1-65alpha
		```
		yum install https://github.com/Comcast/talaria/releases/download/v0.0.1-65alpha/talaria-0.0.1-65.el6.x86_64.rpm
		```