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
1=== modified file 'README.rst'
2--- README.rst 2012-08-02 22:34:50 +0000
3+++ README.rst 2012-08-06 19:00:31 +0000
4@@ -59,6 +59,6 @@
5 Working With Persistit
6 ----------------------
7
8-Add 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.
9+Add 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.
10
11 That's it. You are ready to work with Persistit.
12
13=== modified file 'doc/conf.py'
14--- doc/conf.py 2012-08-02 22:34:50 +0000
15+++ doc/conf.py 2012-08-06 19:00:31 +0000
16@@ -50,7 +50,7 @@
17 #
18 # version = short X.Y version.
19 # release = full version, including alpha/beta/rc tags.
20-version = '3.1.5'
21+version = '3.1.6'
22 release = version
23
24 # Included while processing every rst file. Used only for working around inability
25
26=== modified file 'pom.xml'
27--- pom.xml 2012-08-06 15:34:19 +0000
28+++ pom.xml 2012-08-06 19:00:31 +0000
29@@ -4,7 +4,7 @@
30
31 <groupId>com.akiban</groupId>
32 <artifactId>akiban-persistit</artifactId>
33- <version>3.1.5-SNAPSHOT</version>
34+ <version>3.1.6-SNAPSHOT</version>
35 <packaging>jar</packaging>
36
37 <parent>

Subscribers

People subscribed via source and target branches

to all changes: