1554 Commits

Author SHA1 Message Date
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
Rodolphe Marques
821cfe2b38 fixed indentation error 2016-04-25 17:15:13 +02:00
ryan
833b804fe8 fix yml 2016-04-25 17:09:22 +02:00
troymc
3f02329cdf Easier way to make Fabric init BigchainDB on only 1 node 2016-04-25 16:51:38 +02:00
ryan
d3cc56b4af add election class, process starts 2016-04-25 15:55:37 +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
Rodolphe Marques
dcce6d9504 returns empty list. not None 2016-04-25 13:39:28 +02:00
troymc
7e7f266082 No more apt-get install libssl-dev libffi-dev in fabfile 2016-04-25 13:24:50 +02:00
troymc
423acf4069 Changed pip install to pip3 install in fabfile.py 2016-04-25 13:23:45 +02:00
troymc
c7b4b698c3 Updated docs on startup.sh 2016-04-25 13:22:56 +02:00
troymc
35db72e871 Made branch=pypi the default for startup.sh 2016-04-25 13:19:23 +02:00
troymc
4d83ad982f Merge remote-tracking branch 'origin/master' into feat/202/deploy-local-branch-to-AWS 2016-04-25 11:44:53 +02:00
troymc
efa134c73e Merge remote-tracking branch 'origin/master' into update-changelog-add-v0.1.5-etc 2016-04-25 09:06:52 +02:00
troymc
bbdfc7fc79 Added External Contributors in CHANGELOG.md 2016-04-25 09:06:28 +02:00
Dimitri De Jonghe
1f3a8ed3e1 Merge pull request #212 from bigchaindb/fix/update-to-cryptoconditions-0.1.6
update to cryptoconditions 0.1.6
2016-04-22 14:56:58 +02:00
diminator
6fb6138fae removed cryptography refs from docs 2016-04-22 12:50:10 +02:00
diminator
99b2dd2a61
removing libffi-dev and libssl-dev from distro dependencies (only required for cryptography, which was removed)
(cherry picked from commit 11d1482790ac20983a5e7b5145b5487c70694e84)
2016-04-22 12:50:05 +02:00
diminator
2137203366
removed cryptography refs from docs 2016-04-22 12:41:00 +02:00
diminator
11d1482790
removing libffi-dev and libssl-dev from distro dependencies (only required for cryptography, which was removed) 2016-04-22 12:38:41 +02:00
diminator
a6dd9dc1fd
update to cryptoconditions 0.1.6: removes the need of the cryptography dependency 2016-04-22 12:23:51 +02:00
diminator
c928669230
Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/201/escrow
Conflicts:
	bigchaindb/util.py
2016-04-21 19:07:56 +02:00
diminator
5cea537143
Merge remote-tracking branch 'remotes/origin/master' into feat/128/multiple-input-output
Conflicts:
	bigchaindb/core.py
2016-04-21 19:07:05 +02:00
diminator
e92627e447
uncommented example code 2016-04-21 19:02:07 +02:00
diminator
6d99427bc7
hashlocked conditions + tests + docs 2016-04-21 18:59:48 +02:00
troymc
e7483e8853 Added v0.1.5 and more to CHANGELOG.md 2016-04-21 17:32:14 +02:00
Rodolphe Marques
6da2603e28 Merge pull request #208 from bigchaindb/feat/204/print-version-number
Feat/204/print version number
2016-04-21 17:04:47 +02:00
troymc
b9b7f0d9d4 Updated docs on installng to AWS (new arg for startup.sh) 2016-04-21 16:36:59 +02:00
troymc
a7eca58ad8 Add ability to install to AWS from local Git branch 2016-04-21 16:36:04 +02:00
Ryan Henderson
1d50c8965d Merge pull request #181 from bigchaindb/feat/156/refactor-monitoring-code
Move monitoring code from the main class to processes
2016-04-21 16:22:07 +02:00
vrde
d9da8dc17c
Set logging level for requests to WARNING 2016-04-21 16:16:55 +02:00
Rodolphe Marques
9702190516 code cleanup 2016-04-21 16:01:21 +02:00
diminator
51addb9cc9
Merge remote-tracking branch 'remotes/origin/master' into feat/128/multiple-input-output
Conflicts:
	tests/test_util.py
2016-04-21 15:19:23 +02:00
diminator
6630533441
Merge remote-tracking branch 'remotes/origin/feat/128/multiple-input-output' into feat/201/escrow
Conflicts:
	tests/test_util.py
2016-04-21 14:59:22 +02:00
Rodolphe Marques
8ed76ca234 Import version in bigchaindb.__init__
Print current version with
import bigchaindb
bigchaindb.__version__
2016-04-21 14:40:51 +02:00
Rodolphe Marques
33825ad9dc added short_version field because of readthedocs 2016-04-21 14:13:41 +02:00
Rodolphe Marques
7498fafacc removed unused imports 2016-04-21 13:43:50 +02:00
Rodolphe Marques
b2ad913d82 Merge remote-tracking branch 'remotes/origin/master' into feat/204/print-version-number 2016-04-21 13:43:34 +02:00
Rodolphe Marques
7847dea1cc added version.py 2016-04-21 13:40:57 +02:00
Rodolphe Marques
dcbaedf7ea Unified place for the version number
added --version to bigchain-cli
2016-04-21 13:38:02 +02:00
Alberto Granzotto
ac47f63b93 Merge pull request #200 from bigchaindb/0.1.5
bugfix and bump version to 0.1.5
2016-04-21 11:00:45 +02:00
vrde
592dd04e0b
Merge branch 'master' into feat/156/refactor-monitoring-code 2016-04-20 23:44:27 +02:00