diminator
5eb69a9c01
Merge branch 'core/557/improve-get-transaction' into api/555/transactions-status-endpoint
2016-08-22 18:21:50 +02:00
diminator
827e58bc75
PR review @r-marques
2016-08-22 18:18:10 +02:00
diminator
1fbb0ed4ba
Merge remote-tracking branch 'remotes/origin/master' into core/557/improve-get-transaction
2016-08-22 15:52:01 +02:00
Troy McConaghy
ba0c6f5d39
Merge pull request #582 from bigchaindb/put-back-node-setup-instructions-for-now
...
Docs: Put back the 'Set Up and Run a Cluster Node' page, for now
2016-08-22 15:06:48 +02:00
diminator
150aa1e58f
status endpoint
...
test/docs
2016-08-22 15:05:06 +02:00
vrde
d39c5642ed
Merge branch 'sbellem-setup-no-pinning'
2016-08-22 14:33:05 +02:00
diminator
f8c9abb634
Merge branch 'core/557/improve-get-transaction' into api/555/transactions-status-endpoint
2016-08-22 14:23:12 +02:00
Sylvain Bellemare
ae8ee877cf
Do not pin version of requests in setup.py
2016-08-22 14:08:32 +02:00
diminator
6bf9e08095
updated inline docs
2016-08-22 12:22:22 +02:00
diminator
d8df478925
optional tuple response instead of altering DB object
2016-08-22 12:19:06 +02:00
troymc
20964fd21a
docs: put back the 'Set Up and Run a Cluster Node' page for now
2016-08-22 12:09:53 +02:00
Troy McConaghy
1797960226
Merge pull request #579 from bigchaindb/note-about-commercial-license
...
Note about commercial licenses in LICENSES.md
2016-08-22 09:49:00 +02:00
Troy McConaghy
2b2b94004f
Added note to LICENSES.txt
...
Added a note: "If you want to make modifications to the code in _this_ repository and you want to keep those modifications proprietary, then you must get a commercial license from BigchainDB GmbH."
2016-08-21 18:50:59 +02:00
Sylvain Bellemare
6f159d3930
Closes #348 ( #578 )
2016-08-19 16:00:18 +02:00
vrde
090747b77c
Merge branch 'd01phin-bug/419/config-syntax-error-pretty-message'
2016-08-19 15:28:44 +02:00
vrde
6de6dc733d
Merge branch 'bug/419/config-syntax-error-pretty-message' of https://github.com/d01phin/bigchaindb into d01phin-bug/419/config-syntax-error-pretty-messagee
2016-08-19 15:28:00 +02:00
Dimitri De Jonghe
87a57bae33
#554 transactions GET/POST endpoints ( #563 )
...
* split up views per resource
add error cases to get/post transaction
update docs/test
* remove apiary from docstring
* PR review docs
2016-08-19 13:56:08 +02:00
David Gasparian
6baa9b479a
Changed config parse exception text
2016-08-18 22:19:22 +04:00
ryan
1a174b54dc
add tests
2016-08-18 16:58:41 +02:00
vrde
7b767affc9
Merge branch 'changefeed-supports-more-operations'
2016-08-18 16:33:33 +02:00
ryan
bd9979618d
return block status
2016-08-18 16:04:35 +02:00
Troy McConaghy
9045126c57
Merge pull request #572 from bigchaindb/feat/540/provision-prod-node-aws
...
Using Terraform to provision a one-machine BigchainDB node on AWS
2016-08-18 14:24:05 +02:00
troymc
1ab3344099
fixed merge conflict in .gitignore
2016-08-18 14:17:42 +02:00
Troy McConaghy
025b5cc15d
Merge pull request #567 from bigchaindb/feat/556/bring-your-own-ssh-keypair-for-aws
...
AWS users now generate their own SSH key pair
2016-08-18 13:53:51 +02:00
Troy McConaghy
2cd799a121
Merge pull request #573 from bigchaindb/bug/438/fix-docstring-in-is-valid-transaction
...
Fixed docstring in is_valid_transaction()
2016-08-18 13:26:36 +02:00
Troy McConaghy
ddb80462b6
Fixed docstring in is_valid_transaction()
...
Fixes #438
2016-08-18 10:42:16 +02:00
troymc
7a2c5bb202
Did a minor refactoring of the .tf files
2016-08-18 09:16:18 +02:00
troymc
9243e9b468
Tell Codecov to ignore ntools/*
2016-08-17 21:03:47 +02:00
troymc
7a4dcb07d4
docs: added page about using Terraform to provision a one-machine node on AWS
2016-08-17 20:45:42 +02:00
troymc
a3194c475a
Set instance key_name to value of new variable
2016-08-17 20:44:49 +02:00
Troy McConaghy
dcb2b6bb39
We now use Sphinx, not Apiary, to document REST APIs ( #571 )
...
This change happened a while ago, but I just noticed that we didn't update the README.md file in /docs.
2016-08-17 18:09:45 +02:00
Troy McConaghy
d633d91ae5
Updated LICENSES.md ( #570 )
...
The main change we made was to move the responsibility of stating code licenses to the respective repositories.
2016-08-17 17:52:51 +02:00
vrde
5c2faf5f30
Add support for multiple ops in ChangeFeed
2016-08-17 16:24:56 +02:00
diminator
afc661d360
PR review docs
2016-08-17 15:44:32 +02:00
diminator
7df49b068a
remove apiary from docstring
2016-08-17 15:27:36 +02:00
troymc
85abe24c57
docs: Updated AWS Setup & AWS test cluster depl. docs: generate your own SSH key
2016-08-17 14:03:17 +02:00
troymc
5735e554bc
Updated .gitignore for files added & removed
2016-08-17 14:01:52 +02:00
troymc
329cf9cf81
Make all fabfile.py use the SSH key path in ssh_key.py
2016-08-17 14:00:59 +02:00
troymc
877bd65410
Make launch_ec2_nodes.py read & use SSH_KEY_NAME, and write ssh_key.py
2016-08-17 13:59:56 +02:00
troymc
402463c225
Make awsdeploy.sh read & use SSH_KEY_NAME
2016-08-17 13:59:00 +02:00
troymc
ae9a72bfd2
Added SSH_KEY_NAME to example_deploy_conf.py
2016-08-17 13:57:54 +02:00
diminator
e871458a99
split up views per resource
...
add error cases to get/post transaction
update docs/test
2016-08-17 12:18:52 +02:00
troymc
9a6e02ab16
initial Terraform configuration for one-machine node
2016-08-16 17:11:37 +02:00
troymc
f75fc5e80c
removed placeholder
2016-08-16 09:53:47 +02:00
troymc
0afabc324c
docs: adding to prod. node setup steps
2016-08-15 19:56:53 +02:00
troymc
d222a848bc
Added mapping of aws_region -> recent Ubuntu AMIs
2016-08-15 19:53:44 +02:00
troymc
903029b1a7
add placeholder
2016-08-15 18:20:17 +02:00
David Gasparian
fcca712853
Merge remote-tracking branch 'upstream/master' into bug/419/config-syntax-error-pretty-message
2016-08-15 20:01:46 +04:00
David Gasparian
1b33a43b77
Make file config to handle only JSON errors
2016-08-15 19:52:30 +04:00
vrde
ebe21e5907
Merge branch 'refactor-multiprocessing-for-vote'
2016-08-15 17:03:51 +02:00