Prepare for creation of release branch
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/integration/solr-4.x/trunk@1571073 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 0c803db..5a33719 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,9 @@
Apache ManifoldCF Plugin for Apache Solr 4.x change Log
$Id$
-======================= 1.2-dev =====================
+======================= 1.3-dev =====================
+
+======================= Release 1.2 =====================
CONNECTORS-886: Provide [allow|deny]_token_parent fields.
Upgrade to this version now requires reindexing.
diff --git a/build.xml b/build.xml
index 75c5f3b..55083ba 100644
--- a/build.xml
+++ b/build.xml
@@ -93,7 +93,7 @@
<target name="build" depends="deliver" if="downloaded"/>
<target name="set-version">
- <property name="release-version" value="1.2-dev"/>
+ <property name="release-version" value="1.3-dev"/>
</target>
<target name="create-source-zip" depends="set-version">
diff --git a/mcf/CHANGES.txt b/mcf/CHANGES.txt
index ae3548c..f09332f 100644
--- a/mcf/CHANGES.txt
+++ b/mcf/CHANGES.txt
@@ -13,9 +13,9 @@
the ManifoldCF Authority Service. Other optional parameters are:
AllowAttributePrefix - the first part of the 'allow' family of fields, e.g. "allow_token_document" or
- "allow_token_share" or "allow_token_directory_0", defaulting to "allow_token_".
+ "allow_token_share" or "allow_token_parent", defaulting to "allow_token_".
DenyAttributePrefix - the first part of the 'deny' family of fields, e.g. "deny_token_document" or
- "deny_token_share" or "deny_token_directory_0", defaulting to "deny_token_".
+ "deny_token_share" or "deny_token_parent", defaulting to "deny_token_".
ConnectionPoolSize - the size of the connection pool (default is 50).
$Id$
