ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-29 09:18:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
11,271 Commits 91 Branches 405 Tags 354 MiB
ff4bbaf63f
Commit Graph

1462 Commits

Author SHA1 Message Date
igor nitto
dc076f83ba Merge remote-tracking branch 'open/master' into merges/march-21-16-24 2018-03-21 16:30:31 +00:00
Joel Dudley
4d15e17027
Documents TestIdentity in the testing API docs. 2018-03-21 15:39:16 +00:00
Joel Dudley
9b981c2755
Corrects bootstrapper JAR name. 2018-03-21 15:35:55 +00:00
bpaunescu
79c7fd7c82 Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18 
# Conflicts:
#	docs/source/changelog.rst

added missing changelog line
 2018-03-20 17:13:30 +00:00
bpaunescu
aaa9e8c83f Merge remote-tracking branch 'open/master' into bogdan-merge-20-03-18 
# Conflicts:
#	docs/source/changelog.rst
 2018-03-20 16:54:56 +00:00
Michal Kit
144632818c
Adding the X509CRL custom serializer. (#2844) 
CORDA-1233

* Adding the X509CRL custom serializer.

* Addressing review comments
 2018-03-20 15:42:25 +00:00
szymonsztuka
182294913a
CORDA-2615: Added description for configFile option in deployNodes Cordform Gradle task. (#2825) 2018-03-20 12:53:41 +00:00
Shams Asari
cd038ea107
Fixed docsite on incorrect node config filename required for bootstrapping a local network. (#2848) 2018-03-20 11:42:48 +00:00
tudor.malene@gmail.com
a80be413e0 Merge remote-tracking branch 'open/master' into corda/tudor-os-merge-1 2018-03-20 10:20:17 +00:00
Joel Dudley
5a05704d7a
Expands shell limitations section. 2018-03-20 08:14:33 +00:00
sollecitom
8a561cddbf Merge remote-tracking branch 'remotes/open/master' into merges/march-19-14-41 
# Conflicts:
#	client/rpc/src/test/kotlin/net/corda/client/rpc/RPCPerformanceTests.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/P2PFlowsDrainingModeTest.kt
#	node/src/main/java/CordaCaplet.java
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
 2018-03-19 15:17:49 +00:00
Michele Sollecito
7a077e76f0
CORDA-1099: Orchestrated clean shutdown from Shell (#2831) 2018-03-19 14:20:10 +00:00
szymonsztuka
c4dc8accde Merge remote-tracking branch 'remotes/opensource/master' into merges/1 2018-03-16 17:52:01 +00:00
Joel Dudley
5b7f06a39d
Direct bootstrapper link instead of manual build. 2018-03-16 16:07:39 +00:00
Joel Dudley
d60e0098f2
Removes the glossary and FAQ. Points people to StackOverflow for troubleshooting. 2018-03-16 13:41:38 +00:00
Joel Dudley
06ec20379c
Clarifies that shell doesn't require RPC permissions. 2018-03-16 11:37:23 +00:00
Andrzej Grzesik
3c38cb9b2a Merge remote-tracking branch 'open/master' into ags_2018-03-16 2018-03-16 09:58:52 +00:00
Joel Dudley
22008327cd
Clarifies that blocking calls should take a timeout 2018-03-15 17:10:39 +00:00
Andrius Dagys
0d1e9694ae Merge remote-tracking branch 'open/master' into andrius-merge-1503 2018-03-15 15:07:55 +00:00
Tudor Malene
f67c6874f4
Merge pull request #560 from corda/corda/tudor-os-merge 
Corda/tudor os merge
 2018-03-15 14:21:41 +00:00
Thomas Schroeter
52a4252ac5 [ENT-1567] Document hot-cold deployment 2018-03-15 10:35:12 +00:00
tudor.malene@gmail.com
81932b4e88 Merge branch 'open_master' into corda/tudor-os-merge 
# Conflicts:
#	settings.gradle
#	verifier/build.gradle
#	verifier/src/integration-test/kotlin/net/corda/verifier/GeneratedLedger.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt
#	verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt
#	verifier/src/main/kotlin/net/corda/verifier/Verifier.kt
 2018-03-15 10:21:35 +00:00
Michal Kit
15e4449b38
Adding BigInteger serialization support (#2804) 
* Adding BigInteger serialization support

* Addressing review comments
 2018-03-15 10:11:01 +00:00
Tudor Malene
88c5ab8870 Feature/corda 1219/remove out of process verifier (#2820) 2018-03-15 09:57:59 +00:00
IgorNitto
0a0c8538c4 Merge from Corda/OS 2018-03-14 17:24:47 +00:00
bpaunescu
0b12c5f602 Merge remote-tracking branch 'open/master' into bogdan-merge-14 2018-03-14 15:01:27 +00:00
Joel Dudley
a7d0b124d2
Set up instructions no longer rely on Java installer in Mac (defaults to JDK 9). 2018-03-14 13:38:21 +00:00
Joel Dudley
dc250bc701
Minor clarification of network map docs. 2018-03-14 11:45:26 +00:00
Katelyn Baker
df536cee86
CORDA-966 - RELEASE - Merge release notes from release branch to master (#2775) 2018-03-14 10:05:38 +00:00
Shams Asari
34800ab527
Split up the parsing of the command line arguments from the parsing of the config files. (#547) 
Also, the "config-file" command line argument for the doorman jar is required - it no longer defaults to network-management.conf
 2018-03-14 07:01:53 +00:00
sollecitom
f31afd1520 Merge remote-tracking branch 'remotes/open/master' into merges/march-13-14-55 
# Conflicts:
#	build.gradle
#	docs/source/_static/versions
#	docs/source/running-a-node.rst
 2018-03-13 15:02:58 +00:00
szymonsztuka
98f554c08d
Fix database doc - SQL Server / Azure and PostgreSQL (#539) 
Fixed wrong configuration example for SQL Server / Azure, fixed duplicated and conflicting PostgreSQL instructions after merge from OS.
 2018-03-13 11:31:25 +01:00
Joel Dudley
568f7d7c17
Documents limitations of calls to external resources in flows. 2018-03-13 09:34:00 +00:00
Joel Dudley
d591ed5907
Update key-concepts-transactions.rst. 2018-03-13 04:06:20 +09:00
Joel Dudley
2ecec9617e
Adds demobench as an option for running nodes. Minor reorganisation. 2018-03-13 04:03:17 +09:00
Katelyn Baker
0e33ab7fdb CORDA-966 - RELEASE - Update static versions for V3 2018-03-12 13:40:34 +00:00
ags
dba52b1676
Merge remote-tracking branch 'open/master' into ags_2018-03-12 2018-03-12 11:25:46 +00:00
Joel Dudley
3f735451a5
Documents the default username and password for H2. 2018-03-12 19:15:54 +09:00
Andrius Dagys
98ba212e00 Merge remote-tracking branch 'open/master' into andrius-merge-03-09 2018-03-09 16:09:59 +00:00
Andrius Dagys
2d31247da2 CORDA-1171: When a double-spend occurs, do not send the consuming transaction id and requesting party back to the client - this might lead to privacy leak. Only the transaction id hash is now returned. 2018-03-09 16:00:52 +00:00
szymonsztuka
b86071c5c5
ENT-1566 Fixes for db integration tests + ENT-1575 db migrations for db attachment changes (#521) 
ENT-1575 Add db migrations for db attachment changes,

ENT-1566 Fixes for db integration tests -following changes in CORDA-926 (obligatory node properties), upgrade db schema setup in draining mode/RPC tests, set runMigration=true in properties files for db tests, add new tables for deletion in SQL setup scrips
Updated db integration tests description in testing.rst
 2018-03-09 09:52:44 +00:00
Konstantinos Chalkias
c3c3a859d5
CORDA-1117 - port rst fixes (#2762) 2018-03-08 11:11:28 +00:00
szymonsztuka
3733e7d715 Merge remote-tracking branch 'remotes/open/master' into merges/CORDA-792 
# Conflicts:
#	.idea/compiler.xml
#	build.gradle
#	node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/shell/CordaAuthenticationPlugin.kt
#	node/src/main/kotlin/net/corda/node/shell/CordaSSHAuthInfo.kt
#	node/src/main/kotlin/net/corda/node/shell/RPCOpsWithContext.kt
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
#	settings.gradle
#	testing/test-common/src/main/kotlin/net/corda/testing/common/internal/UnsafeCertificatesFactory.kt
#	tools/shell/src/integration-test/kotlin/net/corda/tools/shell/SSHServerTest.kt
#	tools/shell/src/main/java/net/corda/tools/shell/FlowShellCommand.java
#	tools/shell/src/main/java/net/corda/tools/shell/RunShellCommand.java
#	tools/shell/src/main/java/net/corda/tools/shell/StartShellCommand.java
#	tools/shell/src/main/kotlin/net/corda/tools/shell/FlowWatchPrintingSubscriber.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShell.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/InteractiveShellCommand.kt
#	tools/shell/src/main/kotlin/net/corda/tools/shell/utlities/ANSIProgressRenderer.kt
#	tools/shell/src/main/resources/net/corda/tools/shell/base/login.groovy
#	tools/shell/src/test/kotlin/net/corda/tools/shell/CustomTypeJsonParsingTests.kt
#	tools/shell/src/test/kotlin/net/corda/tools/shell/InteractiveShellTest.kt
 2018-03-07 16:49:00 +00:00
Shams Asari
4e5df2f4fb
Fix permissioning doc (#2755) 2018-03-07 10:39:03 +00:00
szymonsztuka
72074c76c7
[CORDA-792] Standalone Shell (#2663) 
- Existing embedded Shell connects via RPC including checking RPC user credentials (before was a direct use of CordaRPCOps):  in dev mode when console terminal is enabled, node created `shell` user.
- New Standalone Shell app with the same functionalities as Shell: connects to a node via RPC Client,  can use SSL and run SSH server.
 2018-03-07 09:57:32 +00:00
Michele Sollecito
2a5ef62eed
Merge pull request #520 from corda/merges/march-6-16-56 
Merge: 06/03/2018 at 16:56
 2018-03-06 18:58:48 +00:00
Michele Sollecito
da1afd9c55
Introduced copyright in all source files. (#519) 2018-03-06 17:29:21 +00:00
sollecitom
906dae11ad Merge remote-tracking branch 'remotes/open/master' into merges/march-6-16-56 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
 2018-03-06 16:59:13 +00:00
Konstantinos Chalkias
4121f70da3
CORDA-1175 Docs numbering issue and counterparty consistency. (#2744) 2018-03-06 14:22:38 +00:00
tudor.malene@gmail.com
98a4fe1ce3 Merge remote-tracking branch 'open/master' into merge/tudor_network_bootstrap 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
 2018-03-06 11:37:30 +00:00