Merge changes I8445070d,I38f10d62,I2af0bf68

* changes:
  Fix plugin provider names to conform with release train requirement
  Add missing @since tags for new API methods
  DfsReaderOptions are options for a DFS stored repository

12 files changed, 13 insertions, 10 deletions

diff --git a/org.eclipse.jgit.console/plugin.properties b/org.eclipse.jgit.console/plugin.properties
index 988e71695a..73a746b877 100644
--- a/org.eclipse.jgit.console/plugin.properties
+++ b/org.eclipse.jgit.console/plugin.properties
@@ -1,2 +1,2 @@
 plugin_name=JGit Console User Interface
-provider_name=Eclipse.org
+provider_name=Eclipse JGit
diff --git a/org.eclipse.jgit.http.server/plugin.properties b/org.eclipse.jgit.http.server/plugin.properties
index 37074aca13..d891b508f1 100644
--- a/org.eclipse.jgit.http.server/plugin.properties
+++ b/org.eclipse.jgit.http.server/plugin.properties
@@ -1,2 +1,2 @@
 plugin_name=JGit HTTP Server
-provider_name=Eclipse.org
+provider_name=Eclipse JGit
diff --git a/org.eclipse.jgit.http.test/plugin.properties b/org.eclipse.jgit.http.test/plugin.properties
index dd33aea52d..0a620aa302 100644
--- a/org.eclipse.jgit.http.test/plugin.properties
+++ b/org.eclipse.jgit.http.test/plugin.properties
@@ -1,2 +1,2 @@
 plugin_name=JGit HTTP Tests
-provider_name=Eclipse.org
+provider_name=Eclipse JGit
diff --git a/org.eclipse.jgit.junit.http/plugin.properties b/org.eclipse.jgit.junit.http/plugin.properties
index cb837d8453..7a96b09054 100644
--- a/org.eclipse.jgit.junit.http/plugin.properties
+++ b/org.eclipse.jgit.junit.http/plugin.properties
@@ -1,2 +1,2 @@
 plugin_name=JGit JUnit Http Utility Classes
-provider_name=Eclipse.org
+provider_name=Eclipse JGit
diff --git a/org.eclipse.jgit.junit/plugin.properties b/org.eclipse.jgit.junit/plugin.properties
index 836a27f485..9842967f52 100644
--- a/org.eclipse.jgit.junit/plugin.properties
+++ b/org.eclipse.jgit.junit/plugin.properties
@@ -1,2 +1,2 @@
 plugin_name=JGit JUnit Utility Classes
-provider_name=Eclipse.org
+provider_name=Eclipse JGit
diff --git a/org.eclipse.jgit.pgm.test/plugin.properties b/org.eclipse.jgit.pgm.test/plugin.properties
index df18ade427..e131c6970f 100644
--- a/org.eclipse.jgit.pgm.test/plugin.properties
+++ b/org.eclipse.jgit.pgm.test/plugin.properties
@@ -1,2 +1,2 @@
 plugin_name=JGit Command Line Interface Tests
-provider_name=Eclipse.org
+provider_name=Eclipse JGit
diff --git a/org.eclipse.jgit.pgm/plugin.properties b/org.eclipse.jgit.pgm/plugin.properties
index d71fee0860..118fe47b1e 100644
--- a/org.eclipse.jgit.pgm/plugin.properties
+++ b/org.eclipse.jgit.pgm/plugin.properties
@@ -1,2 +1,2 @@
 plugin_name=JGit Command Line Interface
-provider_name=Eclipse.org
+provider_name=Eclipse JGit
diff --git a/org.eclipse.jgit.test/plugin.properties b/org.eclipse.jgit.test/plugin.properties
index ea60411212..1d32644d33 100644
--- a/org.eclipse.jgit.test/plugin.properties
+++ b/org.eclipse.jgit.test/plugin.properties
@@ -1,2 +1,2 @@
 plugin_name=JGit Core Tests
-provider_name=Eclipse.org
+provider_name=Eclipse JGit
diff --git a/org.eclipse.jgit.ui/plugin.properties b/org.eclipse.jgit.ui/plugin.properties
index 71fbb340fd..006c8c2f21 100644
--- a/org.eclipse.jgit.ui/plugin.properties
+++ b/org.eclipse.jgit.ui/plugin.properties
@@ -1,2 +1,2 @@
 plugin_name=JGit AWT User Interface
-provider_name=Eclipse.org
+provider_name=Eclipse JGit
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java
index 4f8a89491a..2a625473b9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java
@@ -51,7 +51,7 @@ import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_FILE_TRESHO
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.storage.pack.PackConfig;
 
-/** Options controlling how objects are read from a DHT stored repository. */
+/** Options controlling how objects are read from a DFS stored repository. */
 public class DfsReaderOptions {
 	/** 1024 (number of bytes in one kibibyte/kilobyte) */
 	public static final int KiB = 1024;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java
index 56ec7af89b..9ef1722d7e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java
@@ -638,6 +638,7 @@ public abstract class RefUpdate {
 	 * are checked explicitly.
 	 *
 	 * @param check
+	 * @since 3.0
 	 */
 	public void setCheckConflicting(boolean check) {
 		checkConflicting = check;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
index c1cda39de7..e3219535c2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java
@@ -379,6 +379,7 @@ public class PackConfig {
 	 * @return true if existing delta chains should be cut at
 	 *         {@link #getMaxDeltaDepth()}. Default is false, allowing existing
 	 *         chains to be of any length.
+	 * @since 3.0
 	 */
 	public boolean getCutDeltaChains() {
 		return cutDeltaChains;
@@ -395,6 +396,7 @@ public class PackConfig {
 	 *
 	 * @param cut
 	 *            true to cut existing chains.
+	 * @since 3.0
 	 */
 	public void setCutDeltaChains(boolean cut) {
 		cutDeltaChains = cut;