11b7bfcaf5
Do not shade references to external annotations. ( #802 )
2018-05-03 14:27:51 +01:00
c044096260
Merge pull request #801 from corda/mkit-os-ent-merge
...
OS -> ENT Merge up to ab80df342a
2018-05-03 12:23:28 +01:00
2e1cee00f7
ENT-1608: Check that notary identities are registered ( #799 )
...
Check that notary identities are registered
On loading new parameteres check that provieded notary identities were
registered by doorman.
Refactor of NetworkParameters loading code in network-management.
2018-05-03 11:09:11 +01:00
e5e98f3540
Merge OS commit 'ab80df342ab8a7ede0539daaee9fcecd02f6aeeb' into enterprise
2018-05-03 10:55:40 +01:00
c3429cc621
Merge pull request #797 from corda/mnesbit-fix-bridge-config-typo
...
Bridge HA config strings hould be URL like.
2018-05-02 17:03:56 +01:00
81905ac400
Merge OS -> ENT up to c3e6b39 (including) pull request #796
2018-05-02 15:57:28 +01:00
94bb3bd0bf
The bridge HA configuration string was meant to be URL like. Correct the typo in this from zk//: to zk://
2018-05-02 14:36:02 +01:00
37b715c955
Revert "artemis upgrade to 2.5.0 ( #3029 )"
...
This reverts commit c3e6b39
2018-05-02 13:47:19 +01:00
a5e2058a5b
Merge pull request #762 from corda/colljos-qa-scenarios
...
ENT-1834: Compatibility Test Suite QA scenarios
2018-05-02 12:30:47 +01:00
6b65bead21
Merge pull request #761 from corda/colljos-behave-rpc-proxy
...
ENT-1834: QA HTTP-RPC Proxy for mixed Corda Node testing using CTS
2018-05-02 12:14:25 +01:00
f013c1dcb7
Address remaining PR review comments.
2018-05-02 11:09:25 +01:00
ccd5f5fd5b
Re-apply previous fixes.
2018-05-02 10:47:12 +01:00
d840099049
Minor updates following PR review feedback.
2018-05-02 10:30:38 +01:00
5ed60ab60d
Bug fix: registration tool doesn't register for service identity if keystore already contains node cert ( #756 )
...
* fix a bug where registration tool will refuse to register for a service identity if the keystore contain NODE_CA key already.
some refactoring
2018-05-02 09:54:28 +01:00
b19dac02c4
remove temporary code, reorder lines
2018-05-02 00:11:18 +01:00
1a616b1063
resolve merge conflicts - compilation error, fix integration tests in remote database mode
2018-05-01 23:48:13 +01:00
b25892e45b
resolved conflicts
2018-05-01 21:32:11 +01:00
764af04608
Moved RPC Proxy to own module in testing/qa/behave/tools
...
Incorporating PR review feedback.
Minor fixes to default path and additional copying of startup script.
2018-05-01 17:04:46 +01:00
8eb976d035
Merge pull request #795 from corda/m4ksio-os-merge-30-04-2018
...
Merged https://github.com/corda/corda/pull/2994 and fixed conflicts
2018-05-01 16:00:42 +01:00
29615f512e
Close DB after test
...
Add unique node prefix to DB source
2018-05-01 14:37:35 +01:00
5edb414a07
Merge pull request #794 from corda/feature/small_fix_doc
...
Fix docs
2018-05-01 13:12:45 +01:00
597a15a230
Compilation fix
...
Daily DB integration test ignore, to release merge lock and allow for proper refactor
2018-05-01 12:33:13 +01:00
bc77492d45
Compilation fix
2018-05-01 10:48:56 +01:00
b6e610252f
Merge commit 'b210f7ab0ba141a6a02e445741dcdab6f9c5b303' into os-merge-30-04
...
# Conflicts:
# node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
2018-04-30 18:22:33 +01:00
7bbae1c311
Fix docs
2018-04-30 18:08:35 +01:00
772061bab5
Merge pull request #793 from corda/feature/ENT-1823/publish_migration_tool
...
ENT-1823 Publish migration tool
2018-04-30 17:42:23 +01:00
2a37ce438a
ENT-1831 Delete notaryhealthcheck which is now in CC ( #791 )
2018-04-30 17:23:59 +01:00
647b821c1c
Merge pull request #787 from corda/mnesbit-add-socks-config-example
...
Add an example config with SOCKS config and load it in test
2018-04-30 16:31:31 +01:00
f25b0bd1c5
Add more documentation on private networks ( #786 )
...
Add more documentation on private networks
2018-04-30 16:01:53 +01:00
e49fbaa956
ENT-1823 Publish migration tool
2018-04-30 15:41:03 +01:00
e62d1f12c1
DEVOPS-663 Publishing of performance test artefacts ( #769 )
...
* Enable publishing of perftest cordapps
* Enable publishing of jmeter-corda as capsule jar
* Enable publishing of jmeter-corda as capsule jar
* jar name
* Correct module name to publish
2018-04-30 14:41:55 +01:00
72ba01669a
Move platformSecureRandom property into a separate class. ( #790 )
...
This allows it to be deleted completely from core-deterministic.
2018-04-30 13:45:46 +01:00
416d4ecaeb
ENT-1428 Vault queries - change SQL generation for aggregate function in 'group by' clause. ( #426 )
...
Vault queries: 'order by' function aggregation e.g. 'order by sum(col)' is replaced by the position of the selected column (e.g. 'order by 1').
Rationale: NonStop database doesn't support aggregation function in order by clause e.g. 'order by (sum col_x)'. I couldn't find a way to force Hibernate to produce alias e.g. ' select sum(col_x) as alias_x... order by also_x ...', and the only solution supported by all db an HPE NonStop is to use positional parameter e.g. 'select sum(col_x) as alias_x... order by 1 ...'
2018-04-30 09:45:15 +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
c3e6b39e59
artemis upgrade to 2.5.0 ( #3029 )
2018-04-27 19:54:08 +01:00
0cbfab9214
CORDA-1335: Move DistributedServiceTests into a separate package to reduce size of attachments produced. ( #3021 )
2018-04-27 16:47:01 +01:00
6e7787bd64
Better login missing cash selection implementation. ( #3026 )
...
* When a cash selection implementation cannot be found for a driver name, print the driver name and also driver names with implementation (available).
* Remove MySQL stub class as it would be misleading in error logs (MySQL would appear as implemented).
2018-04-27 16:06:56 +01:00
efd203e5f3
ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly ( #3004 )
...
* ENT-1540: Make sure transactions with "expired" time windows get re-notarised correctly.
Currently the time window is checked before states are being passed to a uniqueness provider. If the time window is
invalid, the transaction will be rejected even if it has already been notarised, which violated idempotency.
For this reason the time window verification was moved alongside state conflict checks.
* Update API - this only affects custom notary interfaces
2018-04-27 15:02:09 +01:00
70ca8f6d6f
Add an example config with SOCKS config and a trivial test to prove we can load it.
...
Address PR comment
2018-04-27 12:56:34 +01:00
6b78ee8c14
Fix incorrect imports. ( #3022 )
2018-04-27 11:52:51 +01:00
8ce718f4bf
Merge pull request #785 from corda/merges/april-27-09-38
...
Merges: April 27th at 09:38
2018-04-27 17:26:50 +07:00
0f310dd966
Updates withoutIssuer to not strip display token size.
2018-04-27 10:26:47 +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
df5d45a4a6
Enable integration tests to run doorman against remote database (part of ENT-1447) ( #776 )
...
Change integration tests in remote database mode infrastracture to allow passing parameterised dataSource configuration to doorman. Add doorman tables to SQL clearup scripts.
2018-04-27 09:57:16 +01:00
b210f7ab0b
DB test using transaction with rollback rather then recreating whole DB ( #2994 )
...
VaultQuery tests wrapped inside transaction which gets rolled back rather then recreating DB from scratch for each test
Moved Missing schema test to separate class, as it modifies global test class state
2018-04-27 09:52:25 +01:00
235df69efe
[CORDA-1379]: Allow soft trapping of unknown config keys. ( #3011 )
2018-04-27 15:33:13 +07:00
efa69ce959
Whitelists Triple.
2018-04-27 08:57:28 +01:00
aecde00365
CORDA-1001 Remove unused bits of PersistentMap ( #3001 )
...
* Remove unused bits of PersistentMap
* Add persistent map tests
* Reivew comments
2018-04-26 21:58:01 +01: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
a275aec546
Merge pull request #784 from corda/kstreich-ENT-OS-merge
...
OS merge
2018-04-26 18:34:46 +01:00
