cburlinchon
7789d5475f
Revert node suspend and resume ( #744 )
2018-04-17 15:14:58 +01:00
Shams Asari
b6d43c0204
Merge remote-tracking branch 'open/master' into os-merge-1288f63
...
# Conflicts:
# constants.properties
# node/src/main/kotlin/net/corda/node/internal/cordapp/CordappConfigProvider.kt
# samples/cordapp-configuration/src/main/kotlin/net/corda/configsample/ConfigSampleFlow.kt
2018-04-16 17:35:43 +01:00
Shams Asari
1288f63998
Fixed the CorDapp configuration demo ( #2967 )
2018-04-16 17:23:11 +01:00
Rick Parker
34f8719363
ENT-1766 Release soft locks inside the database transaction ( #737 )
2018-04-16 13:51:50 +01:00
Christian Sailer
a0bf0261bb
Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336
2018-04-13 16:39:00 +01:00
Konstantinos Chalkias
6f69f0252d
CORDA-1337 Crypto.registerProviders ( #2962 )
...
CORDA-1337 Crypto.registerProviders + add BCPQC as well
2018-04-13 12:40:15 +01:00
Katarzyna Streich
91c52af5ac
ENT-1584: Subscribe to private network maps using UUIDs ( #2922 )
...
Client private network map implementation
Add private network maps UUIDs to config as extraNetworkMapKeys. Adjust NetworkMapServer implementation accordingly.
Change NetworkMapUpdaterTest to use NetworkMapServer instead of mock
2018-04-13 10:52:45 +01:00
Shams Asari
9b58114146
Merge remote-tracking branch 'open/master' into os-merge-f88542f
...
# Conflicts:
# docs/source/changelog.rst
# finance/src/integration-test/kotlin/net/corda/finance/flows/CashSelectionTest.kt
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
# testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt
2018-04-11 15:40:25 +01:00
szymonsztuka
b46c3b89bd
CORDA-1326 Add default shell user only when local shell is started. ( #2953 )
...
In productionMode ssh could login to a node using "shell/shell" which is supposed to be available only in dev mode (to enable embedded shell).
2018-04-11 14:06:13 +01:00
Matthew Nesbit
8c1e9c069e
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180411
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt
# node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
# node/src/main/resources/reference.conf
# node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt
2018-04-11 14:00:36 +01:00
Shams Asari
4a77712978
Merge remote-tracking branch 'open/master' into os-merge-ecce64b
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt
2018-04-11 11:15:17 +01:00
Matthew Nesbit
70beffac48
Add support for different internal p2p artemis bind address/port ( #2951 )
...
* Add support for different internal p2p artemis bind address/port and externally advertised p2pAddress and port.
* Fix formatting
2018-04-11 10:33:17 +01:00
Shams Asari
ecce64ba03
HttpUrlConnection.getErrorStream() can be null, which if not handled can obscure the reporting of an HTTP error response, like in ENT-1744 ( #2948 )
2018-04-11 09:39:58 +01:00
igor nitto
2fc7e5e674
Classloader loading DataSource must stay open [ENT-1717] ( #709 )
2018-04-10 16:02:03 +01:00
Tudor Malene
4ed917436a
CORDA-1309 Add support for jarDirs config ( #705 )
2018-04-10 11:24:35 +01:00
Anthony Keenan
f798c58c36
Merge remote-tracking branch 'open/master' into anthony-os-merge-20180406
...
# Conflicts:
# testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2018-04-06 11:43:34 +01:00
Rick Parker
130b1d9325
CORDA-1303 Regression: Recording a duplicate transaction attempts sec… ( #2935 )
...
* CORDA-1303 Regression: Recording a duplicate transaction attempts second insert to vault.
Added unit test, and merged mock and real logic.
2018-04-06 10:28:51 +01:00
Shams Asari
a97abbc8c0
Merge remote-tracking branch 'open/master' into os-merge-1b37cef
2018-04-05 17:23:03 +01:00
Shams Asari
1b37cef822
Minor: use of ByteArray.inputStream() and introduced PublicKey.hash ( #2931 )
2018-04-05 17:18:27 +01:00
Michal Kit
c8b58a601f
Adding CRL support in the generated certificates. ( #2932 )
2018-04-05 16:39:41 +01:00
Shams Asari
53a0aae489
Introduced a few helper methods around InputStream.readBytes ( #2928 )
2018-04-05 14:27:42 +01:00
Viktor Kolomeyko
375b4638ba
Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/ent-master-merge
...
# Conflicts:
# node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
# node/src/integration-test/kotlin/net/corda/node/persistence/NodeStatePersistenceTests.kt
2018-04-05 13:12:13 +01:00
Viktor Kolomeyko
9a1c27e3e0
Improve performance of NodeStatePersistenceTests ( #2921 )
...
Packages re-jig was meant to reduce the size of the jars that are being produced by the
node driver. E.g. previously `MessageState` was in package `net.corda` which resulted in jar file
of around 2MB to be created. Same for `NodeStatePersistenceTests` which was in `net.corda.node`
2018-04-05 09:33:03 +01:00
Shams Asari
4c123643ac
Merge pull request #680 from corda/shams-os-merge-0af42bd
...
O/S merge from 0af42bd
2018-04-04 17:38:18 +01:00
Rick Parker
23184b7495
ENT-1729 P2P message de-duplication performance optimisation has a flaw ( #675 )
2018-04-04 15:49:00 +01:00
Shams Asari
7296369541
Merge fixes
2018-04-04 14:52:24 +01:00
Shams Asari
6283462548
Merge remote-tracking branch 'open/master' into shams-os-merge-0af42bd
...
# Conflicts:
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
2018-04-04 14:18:24 +01:00
Andras Slemmer
4334d38bf5
Merge pull request #672 from corda/aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04
...
Merge OS up to 2f1b8ff23e
2018-04-04 12:07:07 +01:00
Andrius Dagys
5909a49c30
ENT-1725: Introduce FlowAsyncOperation ( #658 )
...
* ENT-1725: Introduce FlowAsyncOperation, which allows suspending a flow on a custom operation, such as long running I/O requests, notary commit, etc.
* Move async execute to internal, add more tests.
* Add a 30s test timeout
* Update API doc
2018-04-04 09:52:49 +01:00
szymonsztuka
7ec65901b6
Corda-1286 Fix embedded shell when rpc users from remoted database ( #2910 )
2018-04-03 19:13:41 +01:00
Andras Slemmer
e9d2963912
Measure Action execution times, utilised flow threads
2018-04-03 18:54:48 +01:00
Shams Asari
65ff214130
CORDA-1276: Cleaned up creation of node-info object on node start and when using --just-generate-node-info ( #2909 )
2018-04-03 17:30:53 +01:00
Andras Slemmer
fbafe36643
Merge commit '2f1b8ff23e5a0400f72ff603da10b849604c6b04' into aslemmer-merge-2f1b8ff23e5a0400f72ff603da10b849604c6b04
2018-04-03 17:10:33 +01:00
Andras Slemmer
ef723b1b68
CORDA-1295: Use ConcurrentHashMap instead of synchronised multimap
2018-04-03 12:06:59 +01:00
Andras Slemmer
6d5e08b44e
CORDA-1295: Clean up client->observable association on observable finish
2018-04-03 11:43:17 +01:00
sollecitom
558f5cddce
Porting change to make JPA entities non-final and serializable.
2018-03-29 13:17:22 +01:00
sollecitom
89ecfb96c5
Merge remote-tracking branch 'remotes/open/master' into merges/march-29-13-11
2018-03-29 13:12:00 +01:00
Michele Sollecito
0d1d7daedc
[CORDA-1264]: Ensure correct serialisation and masking for throwables raised by a node and propagated through RPC. ( #2892 )
2018-03-29 13:01:41 +01:00
ags
ed9a31522b
Merge remote-tracking branch 'open/master' into ags_2018-03-29
2018-03-29 09:22:10 +01:00
Andrzej Grzesik
2863f8403b
CORDA-1277 Remove double quotes from keys in reference.conf
...
CORDA-1277 Remove double quotes from keys in reference.conf
2018-03-29 09:15:30 +01:00
Shams Asari
71baccf167
Merge remote-tracking branch 'open/master' into os-merge-d2b7f8b
2018-03-28 17:06:15 +01:00
Katarzyna Streich
d2b7f8b91f
ENT-1686: Improve error message on parameters mismatch ( #2891 )
...
Improve error message on parameters mismatch
2018-03-28 16:48:56 +01:00
ags
43ead64240
updating docs
2018-03-28 15:54:58 +01:00
Katarzyna Streich
2e4b223bd8
ENT-1668: Don't crash on node startup when network map is not available ( #2887 )
...
Fix ENT-1668
Don't crash on node startup when network map is not available
2018-03-28 15:42:39 +01:00
ags
51567e944d
detect quotes in config keys
2018-03-28 15:23:12 +01:00
Shams Asari
768dd32417
ENT-1663 - Inclusion of the cert path and root cert in the exception message when cert path validation fails. ( #2890 )
...
Also, added check to node startup that --initial-registration cannot occur in devMode
2018-03-28 15:18:50 +01:00
Andrius Dagys
447b41d936
MySQL notary service: improve database failover and exception handling.
...
Transactions are now retried if a communication failure occurs during execute() or commit().
Note that this may result in duplicate entries in the notary request log, and false state
commit conflicts (the notary client would still receive a successful response).
We need to tidy this up in the future.
2018-03-28 14:46:27 +01:00
ags
e60b816b19
double quotes in reference conf confuse people
2018-03-28 14:28:55 +01:00
Katelyn Baker
1baa89e9cb
Merge pull request #630 from corda/kat-merge-28-03-18
...
Kat merge 28/03/18
2018-03-28 13:50:17 +01:00
cburlinchon
4558651b58
ENT-1716 Documentation for hot cold ha ( #628 )
2018-03-28 11:44:07 +01:00