Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge beta upstream #296

Merged
merged 170 commits into from
Mar 27, 2019
Merged

Merge beta upstream #296

merged 170 commits into from
Mar 27, 2019

Conversation

leventeliu
Copy link
Contributor

@leventeliu leventeliu commented Mar 27, 2019 •
edited

Close #295

auxten and others added 30 commits March 6, 2019 18:06
@auxten
Use host default name server in docker
7fc4d96
Merge pull request #276 from CovenantSQL/bugfix/dockerUseHostDNS
cccf455 
Use host default name server in docker
@auxten
Update README.md
74c0c84
@auxten
Update README.md
bd3a1cd
@auxten
Add video link
8513c62
Trim release pkg
91b63e5
@auxten
Remove cql-adapter
40ea242
@auxten
Merge pull request #278 from CovenantSQL/feature/trimReleasePkg
305339b 
Trim release pkg
Add more test for symmetric
109bfea
Add end to end decrypt encrypt func
671c434
Support content-type header in cors
2fcc7b0
@foreseaz
Merge pull request #280 from CovenantSQL/bugfix/cors_allowed_headers
0beb125 
Support content-type header in cors
@xq262144
Merge branch 'develop' into feature/e2eCrypt
14e4384
@auxten
Merge pull request #279 from CovenantSQL/feature/e2eCrypt
c4645e2 
Add end to end decrypt encrypt func
@auxten
Add demos
f321302
@auxten
Update demos
e740de2
@laodouya
Remove one useless flag. Reorder some code.
a784986
@laodouya
Split cql command func into internal package
b5a8bfe
@laodouya
Move log and waitTxConfirmationMaxDuration to internal vars.
4a08673
@laodouya
Fix UsqlRegister should not use outside variable.
b5e0875
@laodouya
Move cql console funcs to internal/command
60a6806
@laodouya
Refactor interactive usql feature into console command.
32718ec
@laodouya
Refactor version print into version command.
c9735f1
@laodouya
Refactor token balance check funcs into balance command.
d186072
@laodouya
Refactor createDB feature into create command.
2f59c1d
@laodouya
Refactor dropDB feature into drop command.
dc4fa1a
@laodouya
Fail while cql drop command could not wait tx confirm.
292137c
@laodouya
Refactor updatePermission feature into permission command.
8513210
@laodouya
Refactor transferToken feature into transfer command.
eb6f562
@laodouya
Move ConsoleLog init into package.
93b77dd
auxten and others added 22 commits March 26, 2019 20:27
Merge remote-tracking branch 'origin/develop' into feature/dns-bootstrap
85b0fca
Fix IsTestMode
50784cc
Fix compatibility test
d76877d
Remove default config.DNSSeed.Domain
959cd8b
Fix log typo
2e1912e
Change integration test domain
babcdba
Add default config.BPPeriod = 3s
7a73a10
Default BPPeriod = 10 * time.Second
f5b8f6c
Fix IntergrationTestDomain
23dee46
Update cql rpc help info.
625e96d
Fix TestStartBP_CallRPC
c475009
Make golint happy
9899f0a
Keep testnet config existing known nodes
3fa9a43
@leventeliu
Merge pull request #290 from CovenantSQL/feature/dns-bootstrap
52db6cc 
Simplify cql config and use IPv6 for bootstrap
Merge remote-tracking branch 'origin/develop' into feature/cql_utils_…
7cd6afe 
…refactor
Fix merge conflict
38e860b
Rename balance command to wallet -balance.
81e7a61
Update testnet testcase.
c0363d5
Use strings.EqualFold for user typing check.
362076b
Fix compatibility test.
0d058c6
@auxten
Merge pull request #291 from CovenantSQL/feature/cql_utils_refactor
18e650b 
Move all cql-utils functions to cql command
@leventeliu
Merge remote-tracking branch 'origin/develop' into feature/beta_upstream
cda2a61
@codecov
Copy link

codecov bot commented Mar 27, 2019 •
edited

Codecov Report

Merging #296 into beta will increase coverage by 0.31%.
The diff coverage is 68%.

@@            Coverage Diff             @@
##             beta     #296      +/-   ##
==========================================
+ Coverage   80.95%   81.26%   +0.31%     
==========================================
  Files         158      162       +4     
  Lines       11773    11868      +95     
==========================================
+ Hits         9531     9645     +114     
+ Misses       1569     1515      -54     
- Partials      673      708      +35

auxten
auxten approved these changes Mar 27, 2019
View reviewed changes
Copy link
Contributor

@auxten auxten left a comment

Choose a reason for hiding this comment

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

OK

@auxten auxten merged commit 66e2b91 into beta Mar 27, 2019
@auxten auxten deleted the feature/beta_upstream branch March 27, 2019 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@auxten auxten auxten approved these changes

@laodouya laodouya laodouya approved these changes

@xq262144 xq262144 Awaiting requested review from xq262144

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@leventeliu @auxten @laodouya @foreseaz @xq262144