Merge branch 'staging' into QA

chiragob · web-flow · commit 69d9d32a2354 · 2018-05-15T13:50:03.000+05:30
diff --git a/finish.sh b/finish.sh
@@ -27,6 +27,7 @@ then
       RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_STAGING";
       RANCHER_SECRETKEY="$RANCHER_SECRETKEY_STAGING";
       RANCHER_URL="$RANCHER_URL_STAGING";
+
   }  
 else
   {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ then`
`27`	`27`	`RANCHER_ACCESSKEY="$RANCHER_ACCESSKEY_STAGING";`
`28`	`28`	`RANCHER_SECRETKEY="$RANCHER_SECRETKEY_STAGING";`
`29`	`29`	`RANCHER_URL="$RANCHER_URL_STAGING";`
	`30`	`+`
`30`	`31`	`}`
`31`	`32`	`else`
`32`	`33`	`{`