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

12515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matthew Nesbit
0f98a1cbcd 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:18 +01:00
Andrius Dagys
b45472d579
Docs: Setting up a HA notary (#1169) 
Minor fixes: rename Notary -> notary, replica -> worker.
 2018-07-02 10:38:56 +01:00
Chris Rankin
64d65f0a54
Rename JarFilter's ClassTransformer to FilterTransformer. (#3481) 2018-07-02 10:31:07 +01:00
Matthew Nesbit
5d78992038
Minor changes to text to more accurately reflect the current implementation. (#3477) 2018-07-02 10:26:33 +01:00
Mike Hearn
b48c691abb Docs: repoint Ent docsite at OS 3.1 API docs, as the API we export is currently the same 2018-06-29 17:41:20 +02:00
Joel Dudley
6d77d045e8
Update key-concepts-identity.rst (#3480) 2018-06-29 16:31:48 +01:00
PokeyBot
2b6018f050
Merge pull request #3473 from corda/fix_flaky_test 
[CORDA-1698] Fix flaky test
 2018-06-29 16:26:24 +01:00
Stefano Franz
b49e484fbf
Merge branch 'master' into fix_installer_build 2018-06-29 15:59:31 +01:00
Stefano Franz
b129a44271
Merge pull request #1087 from corda/add_licence_to_installer_2 
ENT-2098 add license acceptance step to installer
 2018-06-29 15:58:08 +01:00
stefanofranz
3b6fd50244 fix issue with base-directory not being set 
fix build issue with installer.sh not containing security.policy from JRE^
 2018-06-29 15:35:00 +01:00
Anthony Keenan
7f3967b767 Fix emojis in latex (#1159) 2018-06-29 14:13:46 +01:00
Shams Asari
f08b0e469d ENT-2182: Clean up of network permissioning docs (#3478) 2018-06-29 13:11:46 +01:00
Anthony Keenan
dbd07a8e6c Fix missing snippets (#1154) 2018-06-29 13:08:09 +01:00
Chris Rankin
c50fd5e07e
ENT-1903: Remove fast-classpath-scanner from serialization-deterministic. (#3471) 2018-06-29 12:22:18 +01:00
szymonsztuka
470921afb9 ENT-1741 Build standalone shell JAR distribution - subsequent fix (#3476) 2018-06-29 12:03:18 +01:00
Joel Dudley
8f254a75ca
Link to where the scripts can be found (#3464) 
* Link to where the scripts can be found

* Address review feedback
 2018-06-29 11:32:53 +01:00
Christian Sailer
532a03adf8 ENT-2173 Drop loadtest documentation, not part of Corda Enterprise. (#1148) (#1150) 2018-06-29 10:58:39 +01:00
Shams Asari
6450d6c777 ENT-2171: Removing outdated information in the serialisation docs (#3475) 2018-06-29 10:50:48 +01:00
szymonsztuka
0a700fd3f0 ENT-1741 Build standalone shell JAR distribution - fix (#3474) 2018-06-29 10:32:37 +01:00
Michele Sollecito
9d6a364692
Merge pull request #1149 from corda/merges/june-29-10-20 
Merges: June 29 at 10:20
 2018-06-29 10:31:34 +01:00
sollecitom
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
Tommy Lillehagen
43e934beb3 ENT-2194 - Fix badly formatted characters in startup banner (#1142) 2018-06-29 10:03:17 +01:00
Tommy Lillehagen
374b3d0a41 ENT-2040 - Remove dependency on PathUtilsKt in net.corda.core.internal (#1141) 2018-06-29 09:58:46 +01:00
Florian Friemel
4c56188383
Cleanup. 2018-06-29 09:55:34 +01:00
szymonsztuka
2d61c76d9d Fix integration test in database mode for test added in ENT-2053 (#1138) 2018-06-29 09:52:36 +01:00
Florian Friemel
302dde88d6
Update api-current.txt to reflect that MockServices now uses TestClock instead of Clock. 2018-06-29 09:50:04 +01:00
PokeyBot
62cb443892
Merge pull request #3470 from corda/pat/ENT-2014-cherry-pick 
Cherry-pick: ENT-2014 Deletes of NodeInfo can fail to propagate leading to infinite retries (#1101)
 2018-06-29 09:42:35 +01:00
Shams Asari
29677a6887 ENT-2171: Removing outdated information in the serialisation docs (#1137) 2018-06-29 09:01:20 +01:00
Shams Asari
8fb47e8072
ENT-2183: Change references to Corda 3 to Corda Enterprise in network map docs (#1132) 2018-06-29 08:48:51 +01:00
Michal Kit
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
Shams Asari
ff30f0769e
Merge pull request #1129 from corda/os-merge-d5b5825 
O/S merge from d5b5825
 2018-06-28 18:18:10 +01:00
Florian Friemel
136500d48d
Advance TestClock instead of sleeping. 2018-06-28 17:58:46 +01:00
Mike Hearn
33511b40dc Minor: work around a Kotlin compiler performance regressions 2018-06-28 18:24:50 +02:00
Thomas Schroeter
5c520bf328 Update docs (#1123) 
Corda -> Corda Enterprise
 2018-06-28 17:20:36 +01:00
Florian Friemel
61d9d475c8
Advance TestClock instead of sleeping. 2018-06-28 17:14:50 +01:00