Merge lp:~akiban-technologies/akiban-persistit/3.2.8-update into lp:akiban-persistit

Proposed by Nathan Williams
Status: Merged
Approved by: Nathan Williams
Approved revision: 429
Merged at revision: 428
Proposed branch: lp:~akiban-technologies/akiban-persistit/3.2.8-update
Merge into: lp:akiban-persistit
Diff against target: 84 lines (+11/-10)
4 files modified
README.rst (+6/-6)
build_release.sh (+3/-2)
doc/conf.py (+1/-1)
pom.xml (+1/-1)
To merge this branch: bzr merge lp:~akiban-technologies/akiban-persistit/3.2.8-update
Reviewer Review Type Date Requested Status
Akiban Technologies Pending
Review via email: mp+155148@code.launchpad.net

Description of the change

Bump version to 3.2.8

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.rst'
2--- README.rst 2013-01-25 19:06:51 +0000
3+++ README.rst 2013-03-24 17:56:19 +0000
4@@ -15,13 +15,13 @@
5 - Implementation of a persistent SortedMap
6 - Extensive management capability including command-line and GUI tools
7
8-See http://www.akiban.com/akiban-persistit for a more detailed summary of features and benefits, licensing information and how to get support.
9+See http://akiban.github.com/persistit/ for more information, documentation, and support details.
10
11 Documentation
12 =============
13-Users Guide: http://www.akiban.com/ak-docs/admin/persistit
14+Users Guide: http://akiban.github.com/persistit/docs/
15
16-JavaDoc: http://www.akiban.com/sites/all/libraries/persistit-api/index.html
17+JavaDoc: http://akiban.github.com/persistit/javadoc/
18
19 Building Akiban Persistit From Source
20 =====================================
21@@ -50,15 +50,15 @@
22 Download and Install Akiban Persistit From Binaries
23 ---------------------------------------------------
24
25-Pre-built jars can be downloaded directly from http://akiban.com/akiban-persistit.
26+Pre-built jars can be downloaded directly from http://akiban.github.com/persistit/.
27
28 Unpack the distribution kit into a convenient directory using the appropriate utility (e.g. unzip or tar).
29
30-Review the ``LICENSE.txt`` file located in the root of the installation directory. Persistit is licensed under the Eclipse Public License or a free-use community license, see our `licensing options <http://www.akiban.com/akiban-licensing-options>`_ for more details. By installing, copying or otherwise using the Software contained in the distribution kit, you agree to be bound by the terms of the license agreement. If you do not agree to these terms, remove and destroy all copies of the software in your possession immediately.
31+Review the ``LICENSE.txt`` file located in the root of the installation directory. Persistit is licensed under the Eclipse Public License. By installing, copying or otherwise using the Software contained in the distribution kit, you agree to be bound by the terms of the license agreement. If you do not agree to these terms, remove and destroy all copies of the software in your possession immediately.
32
33 Working With Persistit
34 ----------------------
35
36-Add the jar file (e.g. ``akiban-persistit-3.2.6.jar``), found in the root directory of the distribution kit, to your project's classpath. For example, copy it to ``jre/lib/ext`` in your Java Runtime Environment, or add it to your classpath environment variable.
37+Add the jar file (e.g. ``akiban-persistit-3.2.8.jar``), found in the root directory of the distribution kit, to your project's classpath. For example, copy it to ``jre/lib/ext`` in your Java Runtime Environment, or add it to your classpath environment variable.
38
39 That's it. You are ready to work with Persistit.
40
41=== modified file 'build_release.sh'
42--- build_release.sh 2013-01-14 16:56:04 +0000
43+++ build_release.sh 2013-03-24 17:56:19 +0000
44@@ -144,11 +144,12 @@
45 echo "Making package directories"
46 cp -r "${BRANCH_DIR}" "${SOURCE_DIR}"
47 cp -r "${BRANCH_DIR}" "${OPEN_DIR}"
48-rm -r "${OPEN_DIR}"/{doc,examples/scripts,src,pom.xml}
49+rm -f "${SOURCE_DIR}/build_release.sh"
50+rm -r "${OPEN_DIR}"/{doc,examples/scripts,src,pom.xml,build_release.sh}
51 mkdir "${OPEN_DIR}/doc"
52
53
54-echo "Building open edition and docs"
55+echo "Building docs"
56 cd "${BRANCH_DIR}"
57 maven_build "${REVNO}"
58 docs_build "../apidocs"
59
60=== modified file 'doc/conf.py'
61--- doc/conf.py 2013-03-22 18:54:33 +0000
62+++ doc/conf.py 2013-03-24 17:56:19 +0000
63@@ -50,7 +50,7 @@
64 #
65 # version = short X.Y version.
66 # release = full version, including alpha/beta/rc tags.
67-version = '3.2.7'
68+version = '3.2.8'
69 release = version
70
71 # Included while processing every rst file. Used only for working around inability
72
73=== modified file 'pom.xml'
74--- pom.xml 2013-03-21 21:21:55 +0000
75+++ pom.xml 2013-03-24 17:56:19 +0000
76@@ -4,7 +4,7 @@
77
78 <groupId>com.akiban</groupId>
79 <artifactId>akiban-persistit</artifactId>
80- <version>3.2.7-SNAPSHOT</version>
81+ <version>3.2.8-SNAPSHOT</version>
82 <packaging>jar</packaging>
83
84 <parent>

Subscribers

People subscribed via source and target branches

to all changes: