638 Commits

Author SHA1 Message Date
diminator
db06970b1a
PR comments 2016-05-03 11:18:57 +02:00
diminator
f5f4c17839 Merge remote-tracking branch 'remotes/origin/master' into feat/127/crypto-conditions-ilp-bigchain-integration-hashlock 2016-05-02 12:13:12 +02:00
Dimitri De Jonghe
9d63b69a9e Merge pull request #174 from bigchaindb/feat/128/multiple-input-output
WIP Feat/128/multiple input output
2016-05-02 12:10:33 +02:00
diminator
35f16b5d65
Merge remote-tracking branch 'remotes/origin/master' into feat/128/multiple-input-output 2016-05-02 12:06:54 +02:00
vrde
ed1415161d
Merge branch 'feature/improve-docker-configuration' 2016-04-28 16:42:45 +02:00
vrde
c9773b3f2c
Merge branch 'master' into feature/improve-docker-configuration 2016-04-28 15:48:19 +02:00
vrde
f5da2af872
Remove smelly code 2016-04-28 15:46:33 +02:00
troymc
cd6bb18f18 Minor edits to the Docker documentation 2016-04-28 13:32:25 +02:00
diminator
55a2222922 Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/127/crypto-conditions-ilp-bigchain-integration-hashlock 2016-04-27 18:07:59 +02:00
vrde
66cd3bb77b
Fix exception in test 2016-04-27 17:17:11 +02:00
vrde
08aaf784e5
Update documentation 2016-04-27 17:14:33 +02:00
vrde
0d6e74cfc7
Use .wait to check when the database is ready 2016-04-27 17:00:21 +02:00
Troy McConaghy
ec0662bdc7 Merge pull request #227 from bigchaindb/further-aws-deployment-improvements
Further AWS deployment improvements
2016-04-27 15:03:24 +02:00
troymc
12a538a933 Use run() rather than sudo() to move conf file to ~ 2016-04-27 13:43:40 +02:00
troymc
344246096d Give IP address to socket.connect, rather than DNS name 2016-04-27 11:57:19 +02:00
troymc
774454e475 Clarified some points in the AWS deployment docs 2016-04-27 09:28:31 +02:00
Rodolphe Marques
1b6edb5115 removed unnecessary comment 2016-04-26 17:48:47 +02:00
diminator
e3774bae82
Merge remote-tracking branch 'remotes/origin/master' into feat/128/multiple-input-output
Conflicts:
	bigchaindb/crypto.py
	bigchaindb/util.py
	docs/source/python-server-api-examples.md
	setup.py
2016-04-26 17:45:26 +02:00
diminator
2eff1f1579
- cryptoconditions 0.2.2
- specified exceptions
2016-04-26 17:42:45 +02:00
Rodolphe Marques
a6fd9142f4 remove unnecessary code from get_fulfillment message 2016-04-26 17:20:33 +02:00
vrde
70b86ce49b
Add artificial delay to wait for tables init 2016-04-26 17:01:37 +02:00
troymc
7fa8f7e9f0 Updated AWS deployment docs 2016-04-26 16:50:55 +02:00
troymc
4d965a8b34 Renumbered confiles to start at 0 2016-04-26 16:49:50 +02:00
Rodolphe Marques
b6d029afa4 refactor sign_tx method 2016-04-26 16:11:21 +02:00
troymc
653a6a231c Instead of waiting 45s, test port 22 conns. until all work 2016-04-26 16:09:06 +02:00
troymc
2ef9bedfef Small changes to output of send_confile in fabfile.py 2016-04-26 15:25:33 +02:00
Rodolphe Marques
877f223244 use better names for the variables in sign_tx 2016-04-26 15:09:57 +02:00
troymc
c3ce5ef4f7 Created make_confiles.sh and clusterize_confiles.py 2016-04-26 15:01:23 +02:00
troymc
1c5c4223c7 Add deploy-cluster-aws/confiles/ to .gitignore 2016-04-26 15:00:35 +02:00
troymc
a7fb8c66a2 Call clusterize_confiles.py & send_confile from startup.sh 2016-04-26 14:58:56 +02:00
Rodolphe Marques
131acb8cb7 better coments for the get_owned_ids method 2016-04-26 14:58:36 +02:00
troymc
fc61a09934 Add set_host() and send_confile() to fabfile.py 2016-04-26 14:56:50 +02:00
Rodolphe Marques
665fea7107 replaced generic exception 2016-04-26 14:50:04 +02:00
troymc
ffb5422c87 Merge remote-tracking branch 'origin/master' into further-aws-deployment-improvements 2016-04-26 14:49:05 +02:00
Rodolphe Marques
73fcd4a905 Merge pull request #226 from bigchaindb/0.2.0
Updated version number and changelog
2016-04-26 11:38:56 +02:00
Rodolphe Marques
267d73b1cf added commit tag to changelog 2016-04-26 11:19:04 +02:00
Rodolphe Marques
0c4a2b380a bump short version v0.2.0 2016-04-26 11:09:55 +02:00
Rodolphe Marques
9143003b1e Updated version number and changelog 2016-04-26 11:06:46 +02:00
Rodolphe Marques
45c72af416 Merge pull request #225 from bigchaindb/bug/213/running-load-with-docker-fix
run the loader inside a running container
2016-04-26 10:57:16 +02:00
Rodolphe Marques
1b54a9ca6f run the loader inside a running container 2016-04-26 10:45:05 +02:00
vrde
9d04018533
Update docs 2016-04-26 04:29:32 +02:00
vrde
2f4c2609a1
Update Dockerfile with new env variables 2016-04-26 04:28:59 +02:00
vrde
56af6e5b12
Move load from bigchain-benchmark to bigchain 2016-04-26 03:43:48 +02:00
vrde
f9c609ff0d
Add env variables to default config 2016-04-26 03:24:56 +02:00
vrde
c3ad343e77
Respect "-" as stdout 2016-04-26 02:14:33 +02:00
vrde
2d6c502ee3
Add exp command to start RethinkDB 2016-04-26 01:42:21 +02:00
troymc
3f02329cdf Easier way to make Fabric init BigchainDB on only 1 node 2016-04-25 16:51:38 +02:00
Troy McConaghy
dca29ffe9f Merge pull request #210 from bigchaindb/update-changelog-add-v0.1.5-etc
Added v0.1.5 and more to CHANGELOG.md
2016-04-25 15:37:27 +02:00
Troy McConaghy
57a9690b15 Merge pull request #209 from bigchaindb/feat/202/deploy-local-branch-to-AWS
Feat/202/deploy local branch to aws
2016-04-25 14:54:22 +02:00
Troy McConaghy
7dd8e63e00 Merge pull request #219 from bigchaindb/fix-documentation
Small fix to the documentation
2016-04-25 13:52:57 +02:00