Christian Sailer
408582cd05
OS -> R3 Corda up to CORDA-1336
...
OS -> R3 Corda up to d8bf1019b6c7ddbe709cff7c730e66eb576f9ad5
2018-04-13 18:09:30 +01:00
Tudor Malene
d34d599baf
fix url ( #735 )
2018-04-13 16:58:19 +01:00
Christian Sailer
a0bf0261bb
Merge commit 'd8bf1019b6c7ddbe709cff7c730e66eb576f9ad5' into christians/merge-CORDA-1336
2018-04-13 16:39:00 +01:00
Christian Sailer
d8bf1019b6
CORDA-1336: Turn off direct delivery in Artemis via config ( #2961 )
...
* CORDA-1336: Turn off direct delivery in Artemis via config - this can
deadlock when the server gets busy and switches back and forth between
direct and async delivery if it can't keep up.
* CORDA-1336: put in a comment explaining the config setting.
2018-04-13 16:17:24 +01:00
Patrick Kuo
7f8c36faa0
ENT-1586 Update entire service stack to support private network maps ( #691 )
...
* private network map
2018-04-13 15:54:53 +01:00
szymonsztuka
05ec885afd
Update integration test setup in database mode after OS->ENT merge ( #732 )
...
Added Notary schema for SQL setup to tests.
Added SQL setup/tearDown to a loop starting the same node few times in DriverTests.
2018-04-13 15:28:07 +01:00
Katelyn Baker
f4ce31019e
Merge pull request #733 from corda/kat-merge-180412
...
MERGE - 18 - 04 - 12
2018-04-13 14:39:15 +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
Katelyn Baker
98b912e633
MERGE: OS Merge Fixes
2018-04-13 11:46:36 +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
Katelyn Baker
03478142ef
MERGE: OS Merge Fixes
2018-04-13 10:44:10 +01:00
Michal Kit
a320c8d49f
ENT-1456 Adding try-catch to jira ticket processing ( #667 )
...
* Adding try-catch to jira ticket processing
* Addressing review comments
* Addressing review comments
* Refactoring getTransitionId method.
* Addressing review comments
* Refactoring to use requireNotNull
* Refactoring to use more requireNotNull
* Fixing missing map population
2018-04-13 07:46:16 +01:00
Katelyn Baker
5bb9514582
Merge remote-tracking branch 'open/master' into kat-merge-180412
2018-04-12 20:34:28 +01:00
Shams Asari
02913b284e
CORDA-1312: Removed the need to have whitelist.txt for updating the contracts whitelist using the bootstrapper. ( #2954 )
...
Instead the current whitelist is read in from the existing network parameters file.
2018-04-12 17:03:06 +01:00
Shams Asari
179e479aa0
Merge pull request #725 from corda/os-merge-f88542f
...
O/S merge from f88542f
2018-04-12 17:00:27 +01:00
Matthew Nesbit
8c1bc71a7d
Merge pull request #728 from corda/mnesbit-publish-bridge-artifact
...
Include artifactory plugin in the bridge
2018-04-12 15:21:21 +01:00
Shams Asari
45d6bca071
Merge branch 'master' into os-merge-f88542f
2018-04-12 15:14:28 +01:00
Shams Asari
a83f3f3abe
Removing explicit waits for the default notary in driver tests.
...
This issue was fixed in https://github.com/corda/corda/pull/2947 .
2018-04-12 15:13:01 +01:00
Patrick Kuo
80c075b19e
Merge pull request #2958 from corda/pat/ent-1323-cherrypick
...
ENT-1323 Network map service to check all identities in submitted node info
2018-04-12 14:04:47 +01:00
Patrick Kuo
eae7d1d3a6
CORDA-1159 Node attempts duplicate CSR if process terminates before receiving Request ID ( #723 )
...
* CORDA-1159 Node attempts duplicate CSR if process terminates before receiving Request ID
2018-04-12 13:53:17 +01:00
Katelyn Baker
842dd04b0c
Merge pull request #2957 from corda/kat/bug/listSetterSerialization
...
CORDA-1329 - Setter serialization fails with lists
2018-04-12 13:21:33 +01:00
Patrick Kuo
b5f304a104
ENT-1323 Network map service to check all identities in submitted node info ( #499 )
...
* ENT-1323 Network map service to check all identities in submitted node info
* fixup after rebase
* address PR issues, refactored createValidNodeInfo
* address PR issues
(cherry picked from commit f9ed55b)
2018-04-12 13:11:30 +01:00
Patrick Kuo
f9ed55b731
ENT-1323 Network map service to check all identities in submitted node info ( #499 )
...
* ENT-1323 Network map service to check all identities in submitted node info
* fixup after rebase
* address PR issues, refactored createValidNodeInfo
* address PR issues
2018-04-12 13:05:15 +01:00
Kat Baker
e6d352e446
Review comments
2018-04-12 12:09:17 +01:00
Kat Baker
03850dabc2
Review comments
2018-04-12 11:58:56 +01:00
Kat Baker
c783c431b1
Fix broken comment
2018-04-12 11:23:13 +01:00
Kat Baker
84914aa5c8
Remove commented out code
2018-04-12 11:18:39 +01:00
Katelyn Baker
f19bcea82f
CORDA-1229 - Setter serialization fails with lists
...
Looks like the super / sub type inference of setter param vs
getter param is the wrong way around. Also, Setter Type should
be the generic type, not just the type
the property must be a supertype of the setter parameter
the getter must be a supertype of the setter parameter
2018-04-12 11:17:26 +01:00
Matthew Nesbit
7bee15374b
Changes as suggested by Clinton
2018-04-12 10:55:08 +01:00
Matthew Nesbit
478e714936
Include artifactory plugin
2018-04-12 10:25:08 +01:00
Katelyn Baker
72bd530b11
Merge pull request #2955 from corda/kat/release/merge-3.1-releasenotes
...
Kat/release/merge 3.1 releasenotes
2018-04-11 16:50:19 +01:00
Tudor Malene
241f7738e4
ENT-1704 restructure db migration documentation ( #636 )
2018-04-11 16:48:25 +01:00
Matthew Nesbit
c7937fa6f9
Merge pull request #704 from corda/mnesbit-consume-filtered-messages
...
When discarding invalid messages we should consume them.
2018-04-11 16:38:27 +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
Katelyn Baker
91fd40c806
RELEASE: Merge V3.0 upgrade notes to master
...
This should've been done at release... I clearly missed back-merging
this file
2018-04-11 15:37:47 +01:00
Shams Asari
f88542faa2
CORDA-1095: Fixed rare race where the startNode future completes before the default notary is visible ( #2947 )
2018-04-11 15:33:55 +01:00
Matthew Nesbit
e51de2739c
When discarding invalid messages we should consume them. When starting up wait for node bridge registration before activating the float, otherwise we have a race condition.
...
Reduce excessive logging
Address PR comments
Address PR comments
2018-04-11 15:26:27 +01:00
Matthew Nesbit
a4a6eedbf0
Merge pull request #721 from corda/mnesbit-merge-20180411
...
Merge up from OS
2018-04-11 15:25:12 +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
2b55a8f67e
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:56 +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
Katelyn Baker
760cc1ec48
RELEASE - merge v3.1 release notes / upgrade notes / changelog to master ( #2937 )
...
* RELEASE - 3.1 upgrade and release notes
* Update docs for change to vno
* address vno change in release notes
* Update release-notes.rst
* make corda links
* Review comments
* Review comments
* review comments
* remove ref to reverted bugfix
* Review comments
2018-04-11 13:57:29 +01:00
Chris Rankin
f6e79cdbea
Upgrade to H2 1.4.197. ( #2918 )
2018-04-11 13:38:06 +01:00
szymonsztuka
2dc2a8dc19
ENT-1727 Fix cash selection with PostgreSQL. ( #2949 )
...
Change conversion to toStringShort() instead of toBase58String() - as done for H2 Cash Selection.
Fix withIssuerRefs case - iterate via list of IssuerRefs and setBytes instead of setArray of BYTEA.
Add test for Cash Selection with issuerRef.
2018-04-11 13:36:29 +01:00
Shams Asari
973f6c0c08
Merge pull request #717 from corda/os-merge-ecce64b
...
O/S merge from ecce64b
2018-04-11 13:25:54 +01:00
Shams Asari
c7ad2ca391
Merge fixes
2018-04-11 11:16:31 +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
Jiachuan
54a6fd0e06
CORDA-1201 Remove duplicated doc section. ( #2924 )
2018-04-11 11:08:20 +01:00
Tudor Malene
aaf3bdacd5
ENT-1698 - transform baseDirectory to an absolute path ( #714 )
2018-04-11 10:41:31 +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
