ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-14 14:42:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
12,550 Commits 96 Branches 407 Tags
Commit Graph

12550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shams Asari
c4d0a62ceb Merge branch 'master' into os-merge-244167d 2018-07-05 15:47:09 +01:00
Shams Asari
0c8c914882 Removing warnings 2018-07-05 15:45:28 +01:00
Tommy Lillehagen
28561280d0 ENT-1955, ENT-2227 - Documentation scrub and TOC update (#1209) 
* ENT-1955 - Fix capitalisation of page headings

* ENT-2227 - Remove design proposals from enterprise docs

* ENT-1955 - Fix formatting issue in release notes

* ENT-1955 - Miscellaneous updates and formatting fixes

* ENT-1955 - Update title of Corda Firewall
 2018-07-05 15:00:43 +01:00
Tommy Lillehagen
2f4642e0fc ENT-1997 - Port doc changes for getting set up from release branch (#1207) 2018-07-05 14:04:01 +01:00
bpaunescu
578e4a53c2
ENT-2226: bump curator version (#1201) 2018-07-05 13:48:54 +01:00
bpaunescu
06ca40c168
ENT-2204: fixed zookeeper client flaky test (#1198) 
* ENT-2204: fixed zookeeper client flaky test

* ENT-2204: use size of list as count for the countdown latch in zk test

* ENT-2204: store timeout value into a variable

* ENT-2204: tidy up, use lambda outside of parenthesis
 2018-07-05 12:59:46 +01:00
Tommy Lillehagen
9fa9521ae8
ENT-2191 - Add version compatibility and platform support matrices (#1195) 
* ENT-2191 - Add version compatibility and platform support matrices

* ENT-2191 - Add note re compatibility commitments
 2018-07-05 11:22:14 +01:00
Shams Asari
20a589d66d Merge remote-tracking branch 'open/master' into os-merge-244167d 
# Conflicts:
#	docs/source/example-code/src/main/kotlin/net/corda/docs/FlowCookbook.kt
#	docs/source/example-code/src/main/kotlin/net/corda/docs/LaunchSpaceshipFlow.kt
#	docs/source/example-code/src/main/kotlin/net/corda/docs/tutorial/tearoffs/TutorialTearOffs.kt
#	docs/source/running-a-node.rst
#	experimental/behave/build.gradle
#	experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/helpers/Substeps.kt
#	experimental/kryo-hook/build.gradle
#	experimental/quasar-hook/build.gradle
#	node/src/integration-test/kotlin/net/corda/node/AuthDBTests.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt
#	node/src/test/java/net/corda/node/services/vault/VaultQueryJavaTests.java
#	node/src/test/kotlin/net/corda/node/internal/NodeTest.kt
#	node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/test/kotlin/net/corda/node/services/persistence/HibernateConfigurationTest.kt
#	samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt
#	samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/NodeBasedTest.kt
 2018-07-04 18:38:34 +01:00
Rick Parker
9b3044186d
ENT-1860 Enterprise sizing guidelines (#1193) 2018-07-04 17:43:21 +01:00
Shams Asari
244167d3e9
Enabled warnings as errors (#3514) 2018-07-04 17:17:27 +01:00
Patrick Kuo
68d0826563
Custom config parser for more complex config structure (#3513) 
* custom config parser for more complex config structure

* address PR issues
 2018-07-04 16:51:54 +01:00
Chris Rankin
d634cdcbac
Clear some cut-and-paste cruft out of our Gradle files. (#3511) 2018-07-04 15:42:43 +01:00
Shams Asari
b8e6c47cfd
Added missing JacksonSupport unit test for Instant (#3507) 2018-07-04 15:39:22 +01:00
Stefano Franz
f19564f9f8
add simple network verification cordapp (#3412) 
* add simple network verification cordapp

* add ability to filter checked counterparties to specific x500
 2018-07-04 11:33:21 +01:00
Matthew Nesbit
507ebf5a0c
Merge pull request #1192 from corda/mnesbit-merge-20180703 
Merge up of AMQP refactor from OS
 2018-07-04 11:17:50 +01:00
Joel Dudley
f103bdc98a
Document node command-line options (#3490) 
* Document node command-line options

* Addresses review feedback.
 2018-07-04 10:41:38 +01:00
Joel Dudley
15dea87109
Clarifies how to run a network across machines (#3508) 
* Update tutorial-cordapp.rst

* Adds warning box.
 2018-07-04 10:22:39 +01:00
Chris Rankin
7839d78338
CORDA-1704: Suppress ProGuard's "note" output (#3499) 
* Reduce ProGuard output for kotlin-metadata artifact.
* Configure ProGuard not to display "notes" about potential configuration issues. Keep notes for the "checkDeterminism" steps, though.
* Also resolve some of the issues that we would now be ignoring.
 2018-07-04 09:15:54 +01:00
Viktor Kolomeyko
b8b5730637 ENT-2160: Documentation updates for tools we ship with GA release. (#1131) (#1191) 
(cherry picked from commit 61506c0)
 2018-07-03 17:11:48 +01:00
Matthew Nesbit
0d18bf8e33 Merge up of cleanup of AMQP protocol code 2018-07-03 17:05:05 +01:00
Matthew Nesbit
15d868b113 Merge up of cleanup of AMQP protocol code 2018-07-03 17:04:42 +01:00
Tudor Malene
911b5ec495 ENT-2180 Document clarifications (#1124) 
* ENT-2180 Document clarifications

* ENT-2180 Document clarifications

* ENT-2180 Address code review changes

* ENT-2180 Address code review changes
 2018-07-03 14:39:57 +01:00
Christian Sailer
a35ba7b59f
Merge pull request #1186 from corda/christians/merge-CORDA-1710 
OS -> Ent merge up to CORDA-1710
 2018-07-03 14:24:43 +01:00
Matthew Nesbit
d0568121b7
Some code tidy up ahead of post-GA development. (#3500) 
Handle SSL Handshake timeouts properly
 2018-07-03 14:16:31 +01:00
Christian Sailer
585f34d079
Enterprise tweaks for node administration (#1182) 2018-07-03 13:59:33 +01:00
Christian Sailer
13d7892ded Merge commit 'a5f43110f01c1bb116bb13274f1046204ee76e5f' into christians/merge-CORDA-1710 2018-07-03 13:05:39 +01:00
Christian Sailer
a5f43110f0
CORDA-1710 Swap order of Java and Kotlin examples in HTML docs (#3488) 
* Swap order of Java and Kotlin examples in HTML docs

* Nicer comment

* Put the hiding of kotlin examples back in the css file (so they start out hidden rather than being hidden when the JS runs - this could potentially make a difference with a large page over a slow connection)
 2018-07-03 12:56:58 +01:00
Stefano Franz
6c71ba0874
Merge pull request #1179 from roastario/publish_installer 
ENT-2193 gradle magic to publish installer
 2018-07-03 11:17:04 +01:00
Michele Sollecito
6c0ac1217c
Updates to master after GA release (#1167) 2018-07-03 10:25:13 +01:00
Andrius Dagys
7c7acc216c
Docs: moved notary setup guides from tutorials to operations. (#1162) 
Created a general notary setup landing page that links to the HA notary guide.
 2018-07-03 10:07:50 +01:00
Viktor Kolomeyko
c4722cc311
Eliminate now redundant AMQP switch (#1176) 2018-07-03 09:46:56 +01:00
Joel Dudley
20b89e06fa
Link is HTTP, not HTTPS (#3497) 2018-07-03 09:41:48 +01:00
Tudor Malene
95d1b1f84e
ENT-2001 use versionInfo when registering node with the doorman (#3435) 
* ENT-2001 use versionInfo when registering node with the doorman

* ENT-2001 address code review changes
 2018-07-03 09:16:48 +01:00
Tommy Lillehagen
d683df5753
CORDA-1711 - Remove dependency on PathUtilsKt in net.corda.core.internal (#3493) 2018-07-02 18:32:38 +01:00
Stefano Franz
d5ebb6da4f gradle magic to publish installer 2018-07-02 18:01:08 +01:00
Stefano Franz
139ebf7977
Merge pull request #1164 from corda/fix_installer_build 
ENT-2193 fix issue with base-directory not being set
 2018-07-02 17:27:37 +01:00
Viktor Kolomeyko
ab3974ed60
Switch dependencies to rpcProxyCompile. (#1173) 
The problem manifests itself in IntelliJ when full rebuilt is performed with Gradle delegation.
In this case IntelliJ executes the following tasks:
`:testing:qa:behave:tools:rpc-proxy:classes`, `:testing:qa:behave:tools:rpc-proxy:testClasses`, `:testing:qa:behave:tools:rpc-proxy:smokeTestClasses` and `:testing:qa:behave:tools:rpc-proxy:rpcProxyClasses`

Without the change when `rpcProxyClasses` task executed - the build fails.

The problem is likely to be caused by the fact that this is a multi-sourceSets project.
 2018-07-02 17:08:55 +01:00
Michele Sollecito
389e6421be
Merge pull request #1178 from corda/christians/os-ent-node-administration-doc 
Christians/os ent node administration doc
 2018-07-02 17:08:22 +01:00
Michele Sollecito
371d61cf1d
Merge pull request #1177 from corda/revert-1175-christians/os-ent-node-administration-doc 
Revert "ENT-2179 merge OS -> enterprise"
 2018-07-02 17:06:34 +01:00
Michele Sollecito
f5797dbbda Revert "ENT-2179 merge OS -> enterprise (#1175)" 
This reverts commit d4131342f4ee5210f34971edf61fcc43a340164a.
 2018-07-02 17:06:20 +01:00
Christian Sailer
d4131342f4 ENT-2179 merge OS -> enterprise (#1175) 
* Node adminstration documentation rewrite (#3484)

* Slight rewrite of Node administation to reflect some dev/prod differnces, and clear up some options.

* different reference name in Enterprise
 2018-07-02 17:06:11 +01:00
Tudor Malene
3adc209e0a
Merge pull request #1171 from corda/feature/ENT-2178/node_database_docs 
ENT-2178 small typo fix
 2018-07-02 15:53:40 +01:00
Christian Sailer
4670c9754b different reference name in Enterprise 2018-07-02 15:48:55 +01:00
Christian Sailer
c82820a3db Merge commit '70374e9724b7b6c696832441c9db39aa3309d1d3' into christians/os-ent-node-administration-doc 2018-07-02 15:48:21 +01:00
Christian Sailer
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
szymonsztuka
f5a1be38ff
ENT-2174 documentation (#1145) 
Links to Bintray to download Corda binaries replaced by mentioning binaries made available to an organization.
 2018-07-02 15:24:12 +01:00
Tudor Malene
b352a93e64 ENT-2178 small typo fix 2018-07-02 13:22:05 +01:00
Matthew Nesbit
4f0d4b24d3
Merge pull request #1170 from corda/mnesbit-merge-20180702 
Merge up from OS
 2018-07-02 13:19:22 +01:00
Matthew Nesbit
912be6cf6a Correction to gradle file 2018-07-02 11:59:04 +01:00
Matthew Nesbit
042ac119a8 Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180702 
# Conflicts:
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
 2018-07-02 11:31:37 +01:00