fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-23 09:41:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Conflicts:
	cmd/tendermint/flags.go
	glide.lock
	glide.yaml
	node/node.go
	rpc/core/routes.go
	version/version.go
This commit is contained in:
Ethan Buchman
2017-01-12 20:48:10 -05:00
parent c1952523cd c3a3cc76d8
commit f347143b3d
13 changed files with 86 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/glide/parse.sh
View File

@ -1,7 +1,4 @@
#! /bin/bash
set -euo pipefail
LIB=$1
set +u
if [[ "$GLIDE" == "" ]]; then
@ -9,4 +6,8 @@ if [[ "$GLIDE" == "" ]]; then
fi
set -u
set -euo pipefail
LIB=$1
cat $GLIDE | grep -A1 $LIB | grep -v $LIB | awk '{print $2}'