Skip to content

Commit

Permalink
Fix getting riak-cs-debug stuck before generating configs
Browse files Browse the repository at this point in the history
  • Loading branch information
ksauzz committed Oct 9, 2015
1 parent ae77651 commit 7a21239
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion rel/files/riak-cs-debug
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,11 @@ if [ 1 -eq $get_logs ]; then
#prefer app.config if it exists
if [ -f "${cs_etc_dir}/app.config" ]; then
appconfig="${cs_etc_dir}/app.config"
riak_epaths=`make_app_epaths "${appconfig}"`
elif [ -d "${cuttlefish_conf_dir}" ]; then
appconfig=`ls -t ${cuttlefish_conf_dir}/app.*.config | head -1`
riak_epaths=`make_app_epaths "${appconfig}"`
fi
riak_epaths=`make_app_epaths "${appconfig}"`
fi

# grab a listing of the log directory to show if there are crash dumps
Expand Down

6 comments on commit 7a21239

@shino
Copy link
Contributor

@shino shino commented on 7a21239 Oct 13, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from shino
at 7a21239

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging basho/riak_cs/bugfix/gh1236-and-gh1263-backport = 7a21239 into borshop-integration-1266-bugfix/gh1236-and-gh1263-backport

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basho/riak_cs/bugfix/gh1236-and-gh1263-backport = 7a21239 merged ok, testing candidate = dd0bc89

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@borshop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding 2.0 to borshop-integration-1266-bugfix/gh1236-and-gh1263-backport = dd0bc89

Please sign in to comment.