1554 Commits

Author SHA1 Message Date
vrde
a56aa992fa
Do not hide empty privkeys 2016-04-06 16:36:12 +02:00
diminator
ce945e3409
Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration
Conflicts:
	bigchaindb/consensus.py
	bigchaindb/util.py
2016-04-06 16:27:56 +02:00
vrde
2a0598e9f1
Merge branch 'develop' into improve-config 2016-04-06 16:26:50 +02:00
Rodolphe Marques
eea3cc015a small fix in the retrieval of the condition in verifying and signing transactions 2016-04-06 16:26:24 +02:00
diminator
ec08bca3d0
fulfillment preparations 2016-04-06 16:21:35 +02:00
Rodolphe Marques
784350a5c8 updated validate transaction. Fixed genesis block 2016-04-06 16:20:36 +02:00
vrde
c5cefd6ad5
Remove useless import 2016-04-06 16:15:38 +02:00
vrde
4b32e8e01a
Use autoconfigure on every command 2016-04-06 16:15:17 +02:00
vrde
aec3b3db6c
Hide private key when showing configuration 2016-04-06 16:14:43 +02:00
Rodolphe Marques
662f32fccb updated verify_signature to check fulfillments 2016-04-06 15:26:42 +02:00
diminator
dd20737bb9 Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration
Conflicts:
	bigchaindb/util.py
2016-04-06 12:41:56 +02:00
Rodolphe Marques
aa626a768d fixed payload handling 2016-04-06 11:50:46 +02:00
diminator
e1d9336803 Merge remote-tracking branch 'remotes/origin/develop' into feat/137/crypto-ed25519-compatible-signing-scheme
Conflicts:
	setup.py
2016-04-06 10:52:49 +02:00
Troy McConaghy
ebb6e1a882 Merge pull request #164 from bigchaindb/how-to-handle-pull-requests-md
Added HOW_TO_HANDLE_PULL_REQUESTS.md
2016-04-05 17:55:06 +02:00
Troy McConaghy
1f677fb4a0 Merge branch 'develop' into how-to-handle-pull-requests-md 2016-04-05 17:43:36 +02:00
Troy McConaghy
cb0944aede Merge pull request #160 from bigchaindb/feat/151/deploy-cluster-on-AWS
Feat/151/deploy cluster on aws
2016-04-05 17:42:29 +02:00
troymc
d6f471af5c Docs now say more about how to check on AWS instances 2016-04-05 17:35:50 +02:00
troymc
1c399486e3 Ensure newly-launched AWS instances don't have same tag as existing instances 2016-04-05 17:00:01 +02:00
troymc
2debba73c4 Add another 'Known Deployment Issue' to AWS deployment docs 2016-04-05 16:59:04 +02:00
troymc
569b6ef761 Comment-out 2 cmds before apt-get update in fabfile 2016-04-05 16:51:24 +02:00
troymc
838ed80770 Docs: Remove ugly red text from headings 2016-04-05 16:50:23 +02:00
troymc
efd6514a04 Fixed apt-get update problem in AWS deployment fabfile 2016-04-05 15:23:26 +02:00
troymc
3f491e5bd1 Ensure Python 2.5-2.7 when using AWS deploy scripts 2016-04-05 15:21:24 +02:00
Rodolphe Marques
dd3bc54c62 changed structure of transactions 2016-04-05 14:36:23 +02:00
troymc
5170676c64 Merge remote-tracking branch 'origin/develop' into feat/151/deploy-cluster-on-AWS 2016-04-05 14:07:16 +02:00
Troy McConaghy
98bd615d57 Merge branch 'develop' into how-to-handle-pull-requests-md 2016-04-05 13:46:49 +02:00
Troy McConaghy
d313bbc321 Merge pull request #161 from bigchaindb/feat/159/add-codecov-yml-file
Added a codecov.yml configuration file
2016-04-05 13:28:28 +02:00
Troy McConaghy
c57148b0f7 Merge branch 'develop' into feat/159/add-codecov-yml-file 2016-04-05 13:14:39 +02:00
troymc
b100e2820c Moved AWS credentials & configs to standard ~/.aws files 2016-04-05 11:09:57 +02:00
troymc
8bcecc38ff Remove fabric check in startup.sh 2016-04-05 11:07:04 +02:00
troymc
acc22fd0b2 one line: pip install fabric fabtools requests boto3 2016-04-04 14:46:11 +02:00
troymc
fa9b32b9bb Merge branch 'develop' into feat/151/deploy-cluster-on-AWS 2016-04-04 14:43:56 +02:00
troymc
0ecdbd82ea Minor edit in HOW_TO_HANDLE_PULL_REQUESTS.md 2016-04-04 11:44:54 +02:00
troymc
ebb8e901da Added HOW_TO_HANDLE_PULL_REQUESTS.md 2016-04-04 11:39:25 +02:00
troymc
4cb6d0a0f4 Merge branch 'roderik-fix/docs-crypto-move' into develop 2016-04-03 17:43:31 +02:00
troymc
d47e87e8dd Merge branch 'fix/docs-crypto-move' of https://github.com/roderik/bigchaindb into roderik-fix/docs-crypto-move 2016-04-03 17:42:27 +02:00
Troy McConaghy
00a3d6dccc Merge pull request #162 from roderik/patch-1
Update the cryptography dependency to 1.2.3
2016-04-03 17:37:37 +02:00
Roderik van der Veer
722cc32393 Update the documentation to reflect the move of generate_keys to the crypto module 2016-04-03 11:43:25 +02:00
Roderik van der Veer
dca2750407 Update the cryptography dependency to 1.2.3
This fixes the `conflicting types for 'BIO_new_mem_buf'` error when running with a recent openssl version, e.g. under Alpine Linux. See https://github.com/pyca/cryptography/issues/2750
2016-04-03 10:18:44 +02:00
troymc
6d31fc92ff Added a codecov.yml configuration file 2016-04-01 16:06:41 +02:00
troymc
86ac6b2483 Added note to docs re/ using a cluster deployed on AWS today 2016-04-01 09:54:51 +02:00
troymc
b1b25a2986 Noted AWS deployment scripts in CHANGELOG.md 2016-04-01 09:05:58 +02:00
troymc
1b18ceabe6 Added deploy-on-aws to /docs/index.rst 2016-04-01 09:02:44 +02:00
troymc
3866537597 1st draft of AWS deployment docs 2016-03-31 19:08:37 +02:00
diminator
9067582bdd updated docs 2016-03-31 18:05:52 +02:00
troymc
72c77cd638 Deleted old AWS deployment Readme.md 2016-03-31 17:56:20 +02:00
troymc
0a890801c5 Rename bigchaindb.conf to rethinkdb.conf (@ AWS deployment) 2016-03-31 15:13:42 +02:00
diminator
ce1302dd90 imports from crypto 2016-03-31 15:10:43 +02:00
troymc
531a60e8aa Refactor how bigchaindb.conf gets written 2016-03-31 14:38:11 +02:00
vrde
5864c34115 Remove redundant documentation 2016-03-31 11:50:48 +02:00