Author: mduerig
Date: Fri Jan 19 15:41:08 2018
New Revision: 1821671
URL: http://svn.apache.org/viewvc?rev=1821671&view=rev
Log:
OAK-7075: Document oak-run compact arguments and system properties
merged r1821668
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-doc/src/site/markdown/osgi_config.md
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 19 15:41:08 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665
+/jackrabbit/oak/trunk:1820660-1820661,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-doc/src/site/markdown/osgi_config.md
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-doc/src/site/markdown/osgi_config.md?rev=1821671&r1=1821670&r2=1821671&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-doc/src/site/markdown/osgi_config.md
(original)
+++ jackrabbit/oak/branches/1.8/oak-doc/src/site/markdown/osgi_config.md Fri
Jan 19 15:41:08 2018
@@ -47,7 +47,7 @@ The first of these configurations, ident
This implementation is the newest and the only actively maintained one, and
should be used unless some legacy use case needs to be supported.
The second and last configuration, identified by
`org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService`, refers to
the old implementation of the Node Store provided by the `oak-segment` bundle.
-This implementation has been deprecated, will not receive any further
improvements and should not be used, if possible.
+This implementation has been deprecated and removed in Oak 1.8. It will not
receive any further improvements and should not be used in new projects.
##### <a name="config-SegmentNodeStoreService"></a>
org.apache.jackrabbit.oak.segment.SegmentNodeStoreService
@@ -114,7 +114,7 @@ compaction.disableEstimation (boolean) -
If this property is set to `true`, the estimation phase of the compaction
process will never run, and compaction will always be triggered for any amount
of garbage in the Node Store.
compaction.retainedGenerations (int) - 2
-: The number of generations to retain the Node Store.
+: The number of generations to retain the Node Store. As of Oak 1.8 this
option is deprecated. Its value defaults to `2` and cannot be changed by the
user.
compaction.memoryThreshold (int) - 15
: The percentage of heap memory that should always be free while compaction
runs.
@@ -139,7 +139,7 @@ Placeholders of any kind in the path are
##### org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService
-**This configuration is deprecated.
+**This configuration is deprecated and has been removed in Oak 1.8.
It belongs to the legacy Node Store implementation provided by the oak-segment
bundle.
This implementation should not be used anymore.
Instead, rely on the Node Store implementation provided by the oak-segment-tar
bundle, whose configuration is described above.**