Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
792 Commits 25 Branches 54 Tags 15 MiB
Commit Graph

792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vrde
2948ccdb2a
Merge branch 'docker-dev' of git://github.com/sbellem/bigchaindb into sbellem-docker-dev 2016-05-20 11:06:50 +02:00
vrde
95fe5a77aa
Merge remote-tracking branch 'origin/feat/317/switch-to-rapidjson' 2016-05-20 10:59:56 +02:00
vrde
40d5d90b6c
Merge remote-tracking branch 'origin/use-pip3-for-setuptools-upgrade' 2016-05-20 10:55:52 +02:00
Ryan Henderson
9f03b2b771 add election class, process starts (#221) 
* add election class, process starts

* remove else clause

* resolve splitvote

* move quorum check to core

* remove comments

* fixed vote counting

* add test

* poison pill

* queue test

* generalize election status

* get correct part of block

* clean shut down

* test block liquidation

* add vote signature checking

* add tests

* user_public_key to user_vk

* python3 style floordivs

* correct verdict for odd number of voters, and tests

* remove whitespace

* simplify verify_vote_signature

* election checks pubkey is in block voters

* tests for elector pubkey

* count invalid votes as votes for invalid block

* test update

* test mismatched vote, block sigs

* variable name change

* comments on voting logic

* comments on voting logic

* remove unused queue

* correct block model

* imperative docstring

* election status class constants

* election tests use constants
 2016-05-19 14:03:52 +02:00
Rodolphe Marques
07df25ffaf fix typo after merge 2016-05-19 12:36:42 +02:00
Rodolphe Marques
925c15e80e Merge remote-tracking branch 'remotes/origin/master' into feat/317/switch-to-rapidjson 2016-05-19 12:01:26 +02:00
Rodolphe Marques
b420b86d69 fix typo 2016-05-19 11:50:43 +02:00
troymc
b1a8741c57 Use pip3 instead of pip to upgrade pip, wheel & setuptools 2016-05-19 11:48:11 +02:00
vrde
b1101747c0
Merge branch 'more-explicit-error-reporting-for-pkg_resources' 2016-05-19 11:42:03 +02:00
vrde
dbbdb2f017
Fix help message 2016-05-19 11:30:58 +02:00
Rodolphe Marques
6d4bb7928b updated documentation 2016-05-19 11:28:34 +02:00
vrde
248f21d8cd
Bump to wake up some CI stuff 2016-05-19 11:23:46 +02:00
vrde
491dc29b41
Use more generic and compatible Exception 2016-05-19 11:08:26 +02:00
Dimitri De Jonghe
ed0b1965bf Merge pull request #281 from bigchaindb/fix/260/add-output-condition-to-fulfillment-message 
Fix #260 transaction malleability
 2016-05-18 16:45:19 +02:00
Rodolphe Marques
50da984626 replaced json with rapidjson 2016-05-18 15:43:47 +02:00
Troy McConaghy
8138a4b1c2 Merge pull request #315 from bigchaindb/codecov-yml-changes-suggested-by-stevepeak 
codecov.yml changes suggested by stevepeak & more
 2016-05-18 10:53:14 +02:00
troymc
7ed2de43ef Ignore benchmarking-tests & speed-tests in codecov.yml 2016-05-18 10:44:30 +02:00
troymc
b38330d0aa codecov.yml changes suggested by stevepeak 2016-05-18 10:43:40 +02:00
Sylvain Bellemare
7f5ae6b4c0 Add docs to run unit tests with docker-compose 2016-05-17 15:23:09 +02:00
diminator
3aba164bfd
logical and rather than bitwise 2016-05-17 15:23:00 +02:00
diminator
3dad488344
condition.serialize_uri => condition_uri 2016-05-17 15:12:20 +02:00
Sylvain Bellemare
d45fb3568a Simplify the service names 2016-05-17 14:53:46 +02:00
Troy McConaghy
71489ac00f Merge pull request #278 from bigchaindb/feat/277/add-gitattributes-file 
Resolve Feat/277/add gitattributes file
 2016-05-17 14:48:48 +02:00
Troy McConaghy
801e077519 Merge pull request #276 from bigchaindb/suggest-updating-pip-etc-in-install-docs 
Install docs: Suggest upgrading pip wheel & setuptools
 2016-05-17 14:44:13 +02:00
Troy McConaghy
bf6298cf17 Merge pull request #291 from bigchaindb/feat/280/deploy_conf_file_for_aws_deployment_config 
Feat/280/deploy conf file for aws deployment config
 2016-05-17 12:58:25 +02:00
troymc
8b52b81e58 Merge branch 'master' into feat/280/deploy_conf_file_for_aws_deployment_config 2016-05-17 11:26:36 +02:00
troymc
f168e97880 Changed settings validation code in launch_ec2_nodes.py 2016-05-17 11:26:09 +02:00
troymc
8839440fd7 In awsdeploy.sh, check if NUM_NODES set 2016-05-17 11:23:15 +02:00
troymc
ebd1b927aa No default AWS deployment config file 2016-05-17 09:29:49 +02:00
troymc
1a2f0e749d Make config filename the 1st arg of awsdeploy.sh 2016-05-16 16:58:37 +02:00
Troy McConaghy
e5e243b116 Merge pull request #309 from sbellem/status-badge 
Add badge for development status
 2016-05-13 17:08:47 +02:00
Sylvain Bellemare
f5e52a7257 Add badge for development status 2016-05-13 17:03:17 +02:00
Sylvain Bellemare
93d3b55770 Re-work docker-compose file 
use version 2 & dedicated dev dockerfile
 2016-05-13 16:22:40 +02:00
Sylvain Bellemare
a05c688682 Parameterize db host config via env var 2016-05-13 16:21:33 +02:00
Alberto Granzotto
9bd0ad6d01 Merge pull request #308 from bigchaindb/update-roadmap-add-table 
Update ROADMAP: add table
 2016-05-13 16:04:03 +02:00
Alberto Granzotto
ccda649ec8 Merge pull request #306 from bigchaindb/roadmap-pic-update 
new roadmap pic
 2016-05-13 16:01:34 +02:00
Trent McConaghy
80b18158fc Update ROADMAP: add table 
The table will make it easy to quickly slice & dice to specific tickets, based on topic (row) & timing (column).
 2016-05-13 15:57:43 +02:00
Sylvain Bellemare
e669a6e8e1 Simplify docs by removing default "latest" tag (#269) 2016-05-13 15:52:55 +02:00
Trent McConaghy
6142f1e2dc new roadmap pic 
In pic: added a couple projects, gave most projects an issue number
 2016-05-13 14:54:19 +02:00
Trent McConaghy
1997dae574 Update ROADMAP.md 
Break apart 'in future' projects to 'start <1 mo' and 'later'.
Add projects by label.
De-emphasize links to milestones, open issues, PRs.
 2016-05-13 14:48:42 +02:00
troymc
4e89d491b1 Bugfix: clusterize_confiles.py was using all keypairs in keypairs.py to make keyring 2016-05-13 13:56:31 +02:00
Alberto Granzotto
e07b5f1f55 Merge pull request #282 from bigchaindb/update-roadmap 
Update ROADMAP.md
 2016-05-13 13:47:18 +02:00
Trent McConaghy
3f0d46fec4 Update ROADMAP.md 
Fix broken links
 2016-05-13 13:44:26 +02:00
troymc
c712447509 Removed comment about keypairs.py in awsdeploy.sh 2016-05-13 13:42:30 +02:00
troymc
6565f7a063 Added deploy_conf.py, changed code to use it, updated docs 2016-05-13 13:39:27 +02:00
Trent McConaghy
4ae118a021 Update ROADMAP.md 2016-05-13 13:37:16 +02:00
Trent McConaghy
dcd1e16ff0 Update ROADMAP.md 2016-05-13 11:25:38 +02:00
Trent McConaghy
c0dca5de84 Update ROADMAP.md 
Roadmap was getting out of date. Make it easier to maintain, and up-to-date, by simply showing our internal planning board.
 2016-05-13 11:06:43 +02:00
Trent McConaghy
2555c8d7f4 Add files via upload 2016-05-13 10:52:41 +02:00
diminator
76eb18329e Merge remote-tracking branch 'remotes/origin/master' into fix/260/add-output-condition-to-fulfillment-message 2016-05-12 16:03:19 +02:00