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

Proposed by Peter Beaman
Status: Merged
Approved by: Nathan Williams
Approved revision: 352
Merged at revision: 351
Proposed branch: lp:~akiban-technologies/akiban-persistit/3.1.6-update
Merge into: lp:akiban-persistit
Diff against target: 37 lines (+3/-3)
3 files modified
README.rst (+1/-1)
doc/conf.py (+1/-1)
pom.xml (+1/-1)
To merge this branch: bzr merge lp:~akiban-technologies/akiban-persistit/3.1.6-update
Reviewer Review Type Date Requested Status
Nathan Williams Approve
Peter Beaman Approve
Review via email: mp+118402@code.launchpad.net

Description of the change

Version 3.1.6-SNAPSHOT update

LBJ: NO_BUILD

To post a comment you must log in.
Revision history for this message
Peter Beaman (pbeaman) wrote :

Mechanical change.

review: Approve
Revision history for this message
Nathan Williams (nwilliams) wrote :

Sorry, just noticed two files needing the version tweaked:
Example jar in README.rst and version in doc/config.py

The cut_release script doesn't yet know about these.

review: Needs Fixing
352. By Peter Beaman

3.1.5->3.1.6 text changes

Revision history for this message
Peter Beaman (pbeaman) wrote :

Thanks. Fixed them.

Revision history for this message
Nathan Williams (nwilliams) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README.rst'
--- README.rst 2012-08-02 22:34:50 +0000
+++ README.rst 2012-08-06 19:00:31 +0000
@@ -59,6 +59,6 @@
59Working With Persistit59Working With Persistit
60----------------------60----------------------
6161
62Add the jar file (e.g. ``akiban-persistit-3.1.5.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. 62Add the jar file (e.g. ``akiban-persistit-3.1.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.
6363
64That's it. You are ready to work with Persistit.64That's it. You are ready to work with Persistit.
6565
=== modified file 'doc/conf.py'
--- doc/conf.py 2012-08-02 22:34:50 +0000
+++ doc/conf.py 2012-08-06 19:00:31 +0000
@@ -50,7 +50,7 @@
50#50#
51# version = short X.Y version.51# version = short X.Y version.
52# release = full version, including alpha/beta/rc tags.52# release = full version, including alpha/beta/rc tags.
53version = '3.1.5'53version = '3.1.6'
54release = version54release = version
5555
56# Included while processing every rst file. Used only for working around inability56# Included while processing every rst file. Used only for working around inability
5757
=== modified file 'pom.xml'
--- pom.xml 2012-08-06 15:34:19 +0000
+++ pom.xml 2012-08-06 19:00:31 +0000
@@ -4,7 +4,7 @@
44
5 <groupId>com.akiban</groupId>5 <groupId>com.akiban</groupId>
6 <artifactId>akiban-persistit</artifactId>6 <artifactId>akiban-persistit</artifactId>
7 <version>3.1.5-SNAPSHOT</version>7 <version>3.1.6-SNAPSHOT</version>
8 <packaging>jar</packaging>8 <packaging>jar</packaging>
99
10 <parent>10 <parent>

Subscribers

People subscribed via source and target branches

to all changes: