Skip to content

Commit

Permalink
Merge branch 'master' into feature/related-list-scroll-timeout
Browse files Browse the repository at this point in the history
  • Loading branch information
David Glick authored Dec 5, 2018
2 parents 37a91d4 + b27cee9 commit 48e417d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion cumulusci/core/config/ScratchOrgConfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ def scratch_info(self):
username = self.config.get("username")
if not username:
raise ScratchOrgException(
"Created scratch org but unable to capture username"
"SFDX claimed to be successful but there was no username "
"in the output...maybe there was a gack?"
)

# Call force:org:display and parse output to get instance_url and
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
asn1crypto==0.24.0
certifi==2018.10.15
certifi==2018.11.29
cffi==1.11.5
chardet==3.0.4
click==7.0
Expand Down

0 comments on commit 48e417d

Please sign in to comment.