Akiban Persistit

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

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

Description of the change

Bump version to 3.1.5 after release.

Includes two small typo fixes in the README file.

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

Thanks.

Revision history for this message
Peter Beaman (pbeaman) :
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 21:23:37 +0000
3+++ README.rst 2012-08-02 23:15:23 +0000
4@@ -40,7 +40,7 @@
5 Building and Running the Examples
6 ---------------------------------
7
8-Small examples are located in the ``examples`` directory. Each has a short README file describing the example, and an Ant build script (http://ant.apache.org). After building the main akiban-persisit jar file using Maven, you may run::
9+Small examples are located in the ``examples`` directory. Each has a short README file describing the example, and an Ant build script (http://ant.apache.org). After building the main akiban-persistit jar file using Maven, you may run::
10
11 ant run
12
13@@ -50,7 +50,7 @@
14 Download and Install Akiban Persistit From Binaries
15 ---------------------------------------------------
16
17-Pre-built jars can be downloaded directlry from http://akiban.com/akiban-persistit.
18+Pre-built jars can be downloaded directly from http://akiban.com/akiban-persistit.
19
20 Unpack the distribution kit into a convenient directory using the appropriate utility (e.g. unzip or tar).
21
22@@ -59,6 +59,6 @@
23 Working With Persistit
24 ----------------------
25
26-Add the ``akiban-persistit-3.1.4.jar`` file, 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.
27+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.
28
29 That's it. You are ready to work with Persistit.
30
31=== modified file 'doc/conf.py'
32--- doc/conf.py 2012-06-15 16:29:28 +0000
33+++ doc/conf.py 2012-08-02 23:15:23 +0000
34@@ -50,7 +50,7 @@
35 #
36 # version = short X.Y version.
37 # release = full version, including alpha/beta/rc tags.
38-version = '3.1.1'
39+version = '3.1.5'
40 release = version
41
42 # Included while processing every rst file. Used only for working around inability
43
44=== modified file 'pom.xml'
45--- pom.xml 2012-08-02 14:19:26 +0000
46+++ pom.xml 2012-08-02 23:15:23 +0000
47@@ -4,7 +4,7 @@
48
49 <groupId>com.akiban</groupId>
50 <artifactId>akiban-persistit</artifactId>
51- <version>3.1.4-SNAPSHOT</version>
52+ <version>3.1.5-SNAPSHOT</version>
53 <packaging>jar</packaging>
54
55 <name>akiban-persistit</name>

Subscribers

People subscribed via source and target branches

to all changes: