8d7aa5f590
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180710
...
# Conflicts:
# .idea/compiler.xml
# docs/source/changelog.rst
# docs/source/network-bootstrapper.rst
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
# node/src/main/kotlin/net/corda/node/services/identity/IdentityServiceUtil.kt
# node/src/main/kotlin/net/corda/node/services/identity/PersistentIdentityService.kt
2018-07-10 11:19:23 +01:00
857ed1897a
CORDA-1712 - Make documentation clearer for Network Bootstrapper ( #3504 )
2018-07-09 17:38:31 +01:00
a2496a752c
[Ent-2176] ( #1126 ) ( #1227 )
2018-07-09 11:54:36 +01:00
70374e9724
Node adminstration documentation rewrite ( #3484 )
...
* Slight rewrite of Node administation to reflect some dev/prod differnces, and clear up some options.
2018-07-02 15:32:47 +01:00
ec4ec7e8c6
Merge remote-tracking branch 'remotes/open/master' into merges/june-29-10-20
...
# Conflicts:
# docs/source/upgrade-notes.rst
2018-06-29 10:22:16 +01:00
7ae0775514
CORDA-1688 Updating CRL config docs ( #3472 )
...
* CORDA-1688 Updating CRL config docs
* Addressing review comments
2018-06-29 08:13:43 +01:00
ab37686ba0
[ENT-2135]: Reigning in the over-ambitious flow framework default thread pool size ( #1075 )
2018-06-26 11:26:19 +01:00
b0946f0a97
[ENT-1994] Add documentation for operational node upgrades ( #1036 )
...
* Add documentation for operational node upgrades
* Add documentation for operational node upgrades
* Address review comments
* Some additional detail added after Richards comments
* Restructure page to make more logical sense
2018-06-25 17:35:11 +01:00
7d975a43e0
Merge pull request #1058 from corda/chrisr3-os-merge
...
Merge from Open Source.
2018-06-23 17:32:27 +01:00
8b3a5432cb
Merge commit '02348a584d56cdb562581d99be5b56348f7d1001' into chrisr3-os-merge
2018-06-23 00:06:11 +01:00
c35f576091
ENT-1953 enterprise tuning config documentation ( #996 )
...
* ENT-1953 enterprise tuning config documentation
* Add information about suspended flows
* Review: dropped all the dangerous low level flags that should not be tweaked by users, added some more general explanation.
* Review: typo plus comment about db impact
* Reshuffle doc to be more consistent
* Review: more refinements
* Reflect smart default values for performance properties
* Code review: typo
2018-06-22 21:41:31 +01:00
d0300261cb
Merge pull request #1052 from corda/tudor-merge-21-06
...
Tudor merge 21 06
2018-06-22 09:33:46 +01:00
692d421abf
ENT-1892, ENT-1875 - doc fixes ( #1048 )
2018-06-22 09:23:47 +01:00
3125ec9f73
[ENT-1955] Documentation fixes ( #3417 )
2018-06-21 16:57:30 +01:00
fb3e216318
Merge remote-tracking branch 'open/master' into tudor-merge-21-06
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
2018-06-21 16:51:19 +01:00
381aadc78f
ENT-1796 RPC SSL ( #3401 )
...
* ENT-1796 add just-generate-rpc-ssl-settings command line flag. Fix ssl configuration and documentation
* ENT-1796 small fix. change alias
* ENT-1796 address code review changes
* ENT-1796 revert file
* ENT-1796 Added check to display better error message
* ENT-1796 Doc fixes
2018-06-21 16:46:05 +01:00
f99f483f0d
Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-19-2dded2a
2018-06-19 11:18:28 +01:00
20aca788ce
[CORDA-1605]: When one node in a transaction fails to respond, operator of initiating node needs to understand which node it is waiting for (fix) ( #3393 )
2018-06-18 17:59:00 +01:00
cb810f0660
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180613-1
...
# Conflicts:
# .idea/compiler.xml
# build.gradle
# docs/source/changelog.rst
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-06-13 11:13:43 +01:00
0f3453d1c7
add configuration option to enable compatibility zone whilst running devMode
...
* add configuration option to enable compatibility zone whilst running devMode
* add documentation about allowCompatibilityZone
* address review comments
* remove extra doc lines
* add changelog entry
* Update changelog.rst
2018-06-12 11:03:32 +01:00
b0d86e04d7
Merge remote-tracking branch 'open/master' into aslemmer-os-merge-11-jun
2018-06-11 16:05:39 +01:00
85fe0e4cb1
CORDA-1494: Rename p2pMessagingRetry configuration to flowTimeout configuration to reflect the change in how retries are implemented – it is now on flow rather than message level. ( #3339 )
2018-06-11 15:50:06 +01:00
d821f6d9e3
ENT-2035 / ENT-2037 Document JDBC driver in ./drivers directory ( #939 )
...
Enterprise tarball Corda distribution can only load JDBC jars from relative ./drivers directory.
The Capsule version can use directory specified by jarDirs config property and jarDirs was documented as a way to add JDBC drivers.
To make it consistent between tarball and Capsule version enterprise docs will be updated to use ./drivers dir, still preserving jarDirsbut state this option is not advisable and depending on the distribution may not work.
2018-06-07 10:35:00 +01:00
4882e2e089
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180605
2018-06-05 13:37:35 +01:00
010c30f6d4
DOCS - Remove references to webAddress since it's no longer a valid option ( #3293 )
2018-06-05 10:57:19 +01:00
37cadbce69
Resolved merge conflicts.
2018-05-30 16:36:06 +01:00
9418f9191e
Document notary.serviceLegalName ( #3265 )
2018-05-30 15:47:40 +01:00
1a82de8b53
Document ability to add custom dataSource properties - related to ENT-1428 ( #870 )
...
When specifying data source for NonStop database custom data source properties needs to be passed, which was always feasible but never documented (as there was no need for it).
2018-05-30 14:54:55 +01:00
c6168cb4e6
Resloved merge conflicts.
2018-05-29 11:32:43 +01:00
a63e08d94c
Add example in docs for node SSH server port configuration option. ( #3236 )
2018-05-25 17:38:34 +02:00
033a5798a1
Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180525-1
...
# Conflicts:
# .idea/compiler.xml
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPChannelHandler.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/protonwrapper/netty/AMQPClient.kt
# node/src/integration-test/kotlin/net/corda/node/services/network/NetworkMapTest.kt
# node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/statemachine/transitions/DeliverSessionMessageTransition.kt
# node/src/main/resources/reference.conf
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# settings.gradle
2018-05-25 14:19:15 +01:00
a3d88f752d
CORDA-1510 - Allow Doorman and NetworkMap to be configured independently ( #3220 )
...
* CORDA-1510 - Allow Doorman and NetworkMap to be configured independently
Currently only one compatabilityZoneURL can be specified, however the
two services can be run on as separate servers. Allow nodes to be
configured in this manner
* Partial review comments
* Review comments
* review comments
2018-05-25 11:37:20 +01:00
2ca11d7996
Merge remote-tracking branch 'open/master' into tudor-merge-21-05-18
...
# Conflicts:
# .idea/compiler.xml
# client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
# client/rpc/src/main/kotlin/net/corda/client/rpc/internal/CordaRPCClientUtils.kt
# docs/source/generating-a-node.rst
# finance/src/main/kotlin/net/corda/finance/contracts/asset/CommodityContract.kt
# node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisMessagingClient.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
# node/src/integration-test/kotlin/net/corda/node/amqp/ProtonWrapperTests.kt
# node/src/integration-test/kotlin/net/corda/node/services/rpc/RpcSslTest.kt
# node/src/main/kotlin/net/corda/node/internal/Node.kt
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/kotlin/net/corda/node/services/config/SslOptions.kt
# node/src/main/kotlin/net/corda/node/services/messaging/RPCMessagingClient.kt
# node/src/main/kotlin/net/corda/node/services/rpc/NodeLoginModule.kt
# tools/shell/src/integration-test/kotlin/net/corda/tools/shell/InteractiveShellIntegrationTest.kt
2018-05-21 13:49:59 +01:00
fc88cefbc8
CORDA-1288 Node properties can be set as system properties. ( #3172 )
2018-05-21 10:55:44 +01:00
74c5cffd38
Merge remote-tracking branch 'open/master' into kat-merge-20180517
2018-05-17 15:04:51 +01:00
0ee116a1d9
CORDA-1476 Adding TLS certificate CRL extension point configs ( #3140 )
...
* Adding TLS certificate CRL extension point configs
* Addressing review comments
* Addressing review comments - round 3
2018-05-17 08:21:24 +01:00
9b42dd3a87
Merge branch 'tudor_os_merge' into tudor_merge_14_05_2018
...
# Conflicts:
# constants.properties
# node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt
# testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/RPCDriver.kt
2018-05-14 15:20:14 +01:00
543491c7df
CORDA-1461 improve devMode ( #3100 )
...
* CORDA-1461 improve devMode
* CORDA-1461 set devMode=true for driver
* CORDA-1461 fix tests and improve UI
* CORDA-1461 Address code review changes
* CORDA-1461 Missing developer emoji
* CORDA-1461 use latest cordform that sets devMode=true
* CORDA-1461 fix test and add driver overrides for notary
* CORDA-1461 fix tests, fix api-scanner version
* CORDA-1461 fix api
* CORDA-1461 formatting
* CORDA-1461 comment style
2018-05-11 17:48:02 +01:00
ce7ba2182b
Merge remote-tracking branch 'open/master' into mike-merge-ea81548d6
2018-05-11 16:41:39 +02:00
54e1a7aa7e
Docs: fix some broken markup that caused rendering errors and warnings.
2018-05-11 13:02:40 +02:00
42452c6735
Fix problem with Python PDF builder failing to render the Sphinx :math: tag directive correctly. ( #3113 )
2018-05-11 09:26:54 +01:00
8d6c54e2d5
Merge commit '781b50642aec9deeeadee219318509e050f9026e' into chrisr3-os-merge
2018-05-09 13:50:46 +01:00
a70e479696
ENT-1762 doc around jarDirs ( #3094 )
...
* ENT-1762 doc around jarDirs
2018-05-09 11:16:36 +01:00
e5e98f3540
Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise
2018-05-03 10:55:40 +01:00
7bbae1c311
Fix docs
2018-04-30 18:08:35 +01:00
ab80df342a
CORDA-1319 Adding CRL checking for nodes ( #2987 )
...
* Adding CRL support for nodes
* Addressing review comments
2018-04-30 09:26:26 +01:00
70b32636b5
Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38
...
# Conflicts:
# docs/source/changelog.rst
# node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
2018-04-27 10:12:15 +01:00
235df69efe
[CORDA-1379]: Allow soft trapping of unknown config keys. ( #3011 )
2018-04-27 15:33:13 +07:00
cec2f25c67
ENT-1627 - Allow to set hibernate.dialect setting for pluggable database ( #687 )
...
Optional property `database.hibernateDialect` which maps to `hibernate.dialect`.
2018-04-26 19:05:55 +01:00
627708a63a
Merge commit 'cde701ab10a04a25fca2e7c69d8b49e36f439f58' into kstreich-ENT-OS-merge
2018-04-26 16:30:47 +01:00
