muawiakh
320e09dee3
Resolved merge conflicts again
2018-02-08 15:57:37 +01:00
Ahmed Muawia Khan
1f172b1b3c
Merge pull request #2029 from bigchaindb/vagrant-fix-ubuntu-xenial
...
Fixing Vagrant tutorial
2018-02-08 15:57:05 +01:00
muawiakh
d6a7500abc
Resolved merge conflicts with tendermint branch
2018-02-08 15:52:31 +01:00
muawiakh
b68c0ccbc0
Addressing comments and removing *-tm* or *-tmt* references
2018-02-08 15:48:45 +01:00
Sylvain Bellemare
5d0463282b
Add tendermint marker to pytest.ini
2018-02-08 15:41:44 +01:00
Sylvain Bellemare
cc069fa640
Add db_context fixture
2018-02-08 15:26:50 +01:00
Sylvain Bellemare
b2584dd0fa
Order imports as per pep 8
2018-02-08 15:19:47 +01:00
Troy McConaghy
1ba9233310
tendermint-instance-? --> tm-instance-?
2018-02-08 14:52:45 +01:00
muawiakh
1df86234d6
Fix Vagrant tutorial
2018-02-08 14:52:37 +01:00
Vanshdeep Singh
fa33fc26af
Integrate get block with transaction id api ( #2021 )
...
* Integrate api, get block with transaction id
* Fixed docs and docstrings
* Fix docs
* Remove status from tendermint, fix mongo query
2018-02-08 14:32:21 +01:00
Troy McConaghy
8945dd2332
Re-org headings in Prod. Dep. Template - Overview page
2018-02-08 14:20:50 +01:00
muawiakh
6052043a03
Remove unwanted references
2018-02-08 12:17:40 +01:00
muawiakh
03219a9371
Remove references from BigchainDB 1.x deployment strategy
...
- Remove references from existing deployment model
- Address comments, fix typos, minor structure changes.
2018-02-08 11:54:57 +01:00
Ahmed Muawia Khan
f88ce7c1eb
Merge pull request #1877 from bigchaindb/template-spec
...
Add guidelines for new features in BigchainDB
2018-02-06 12:40:05 +01:00
Ahmed Muawia Khan
b4acee0425
Merge pull request #2019 from bigchaindb/storage-engine-fix
...
Fix storage-engine-cache size issue
2018-02-06 11:51:27 +01:00
muawiakh
75e90c964f
Merge branch 'master' into storage-engine-fix
2018-02-05 18:06:25 +01:00
muawiakh
8477392abd
Merge branch 'master' into template-spec
2018-02-05 18:03:55 +01:00
Vanshdeep Singh
a7ed8cf4cb
Write transactions on commit ( #2017 )
...
* Write transacitons on commit
* Fix docs strings, lazy check for duplicates
2018-02-02 14:40:24 +01:00
Ahmed Muawia Khan
4147e59edb
Merge pull request #2023 from sbellem/update-ssl-certs-for-tests
...
Update SSL certs and keys for tests
2018-02-02 12:03:12 +01:00
Sylvain Bellemare
5cec22d659
Update SSL certs and keys for tests
...
fixes #2015
2018-02-01 17:24:52 +01:00
muawiakh
1a0c165487
Address comments
...
- Keep only tendermint specific files, remove reference to older
deployment strategy
- Update Bigchaindb Dockerfile
2018-02-01 13:02:39 +01:00
Troy McConaghy
402abe72e8
Merge pull request #2020 from bigchaindb/update-main-license-to-apache-v2
...
Updated main code license to Apache v2 in LICENSES.md
2018-01-31 16:30:33 +01:00
Troy McConaghy
2759320ea3
Updated main code license to Apache v2 in LICENSES.md
2018-01-31 16:15:16 +01:00
muawiakh
6e055c642c
Fix storage-engine-cache size issue
...
- Allow for empty values
- Allow if you don't specify the --storage-engine-cache-size
2018-01-31 15:46:39 +01:00
Vanshdeep Singh
e25d365828
Integrate blocks API ( #1970 )
...
* Integrate blocks api
* Update docs
* Fix docs
* Fixed mismatch between code and documentation
* Fixed docs
2018-01-31 14:42:41 +01:00
muawiakh
6a8cb99597
Merge branch 'master' into template-spec
2018-01-30 16:41:01 +01:00
muawiakh
1048d6a170
Update document reference in issue_template
2018-01-30 14:24:50 +01:00
muawiakh
d9f927bcd9
Update minor typos and directory references
2018-01-30 14:21:52 +01:00
vrde
c156d0bfe8
Merge pull request #1996 from bigchaindb/1995-mode-API
...
add mode parameter to transaction endpoint, fixes #1995
2018-01-29 12:00:32 +01:00
Troy McConaghy
328f2ed193
Some minor copy-editing
2018-01-24 16:43:35 +01:00
muawiakh
0216ffd1e8
minor change
...
- update formatting in example spec
2018-01-24 13:41:07 +01:00
muawiakh
407935c982
Move bigchaindb/docs/specs to bigchaindb/proposals
...
- Use *.md for example spec instead of *.rst
2018-01-24 13:32:50 +01:00
codegeschrei
e74fb096fc
requested changes
2018-01-24 11:59:50 +01:00
codegeschrei
ff50d243bc
Merge branch 'tendermint' into 1995-mode-API
2018-01-24 11:58:13 +01:00
vrde
73ba3f5eb0
Merge pull request #1967 from sbellem/measure-branch-coverage
...
Closes #1736
2018-01-23 17:28:33 +01:00
muawiakh
0016c86e0b
Address comments
...
- Remove release process changes
- Specs per release will be tracked as part of a different PR
and proposal
2018-01-17 10:43:35 +01:00
Sylvain Bellemare
8c600e7137
Pin tendermint to 0.13
2018-01-16 14:18:52 +01:00
Sylvain Bellemare
077b7d3589
Merge branch 'master' of github.com:bigchaindb/bigchaindb into tendermint
2018-01-16 12:07:34 +01:00
Sylvain Bellemare
afda1686e6
Upgrade aiohttp
...
related to https://github.com/aio-libs/aiohttp/pull/2667
2018-01-16 12:05:47 +01:00
Sylvain Bellemare
d2f1282333
Merge branch 'master' of github.com:bigchaindb/bigchaindb into tendermint
2018-01-15 19:29:35 +01:00
Sylvain Bellemare
9bed8f363a
Fixes #1930
2018-01-15 19:08:58 +01:00
muawiakh
ab9e1f71c7
Pin yarl version to 0.18.* in setup.py
...
- We need to pin this dependency because version 1.0.0 of yarl
does not expose `unquote` and if we do not pin it, the latest
version >=1.*.* is downloaded and `aiohttp` expects it.
- This can also be fixed on `aiohttp`, but meanwhile :)
2018-01-15 18:55:09 +01:00
codegeschrei
1d99d6e8a8
requested changes
2018-01-15 17:12:17 +01:00
Sylvain Bellemare
2d0e83657e
Parametrize host and port used by event stream
...
closes #1994
2018-01-15 16:19:08 +01:00
Sylvain Bellemare
76ac3b3c6c
Order import as per PEP 8
2018-01-15 16:19:08 +01:00
muawiakh
93070bf9fe
Update docs II
2018-01-12 18:21:19 +01:00
muawiakh
c4e752d379
Address comments
...
- Use aafigure to render text -> HTML/image
- Update some docs
2018-01-12 18:16:05 +01:00
codegeschrei
411d1963bb
requested changes
2018-01-12 11:06:27 +01:00
codegeschrei
b7d235379a
fix tests
2018-01-11 13:44:54 +01:00
codegeschrei
06a091e215
add mode parameter to transaction endpoint, fixes #1995
2018-01-11 13:26:06 +01:00
