Merge branch 'issue_582_config' into amazon_deploy
Conflicts: package.json
No related branches found
No related tags found
Showing
- bin/browserid 3 additions, 2 deletionsbin/browserid
- bin/dbwriter 4 additions, 6 deletionsbin/dbwriter
- bin/keysigner 9 additions, 2 deletionsbin/keysigner
- config/local.json 18 additions, 0 deletionsconfig/local.json
- lib/configuration.js 170 additions, 203 deletionslib/configuration.js
- lib/db/mysql.js 1 addition, 1 deletionlib/db/mysql.js
- lib/email.js 2 additions, 2 deletionslib/email.js
- lib/keysigner/ca.js 6 additions, 10 deletionslib/keysigner/ca.js
- lib/keysigner/keysigner-compute.js 2 additions, 3 deletionslib/keysigner/keysigner-compute.js
- lib/logging.js 2 additions, 2 deletionslib/logging.js
- lib/primary.js 4 additions, 2 deletionslib/primary.js
- lib/verifier/certassertion.js 8 additions, 5 deletionslib/verifier/certassertion.js
- lib/wsapi.js 2 additions, 6 deletionslib/wsapi.js
- lib/wsapi/cert_key.js 3 additions, 2 deletionslib/wsapi/cert_key.js
- lib/wsapi/stage_email.js 0 additions, 1 deletionlib/wsapi/stage_email.js
- package.json 3 additions, 1 deletionpackage.json
- scripts/run_locally.js 19 additions, 29 deletionsscripts/run_locally.js
- scripts/test_db_connectivity.js 5 additions, 0 deletionsscripts/test_db_connectivity.js
- tests/ca-test.js 2 additions, 2 deletionstests/ca-test.js
- tests/cert-emails-test.js 2 additions, 2 deletionstests/cert-emails-test.js
Loading
Please register or sign in to comment