Merge lp:~akiban-technologies/akiban-server/1.6.2-update into lp:~akiban-technologies/akiban-server/trunk

Proposed by Nathan Williams
Status: Merged
Approved by: Nathan Williams
Approved revision: 2737
Merged at revision: 2735
Proposed branch: lp:~akiban-technologies/akiban-server/1.6.2-update
Merge into: lp:~akiban-technologies/akiban-server/trunk
Diff against target: 134 lines (+21/-15)
7 files modified
bin/akserver (+1/-1)
bin/akserver.cmd (+1/-1)
debian/changelog (+6/-0)
debian/rules (+4/-4)
pom.xml (+3/-3)
redhat/akiban-server.spec (+5/-5)
redhat/akiban.spec (+1/-1)
To merge this branch: bzr merge lp:~akiban-technologies/akiban-server/1.6.2-update
Reviewer Review Type Date Requested Status
Akiban Technologies Pending
Review via email: mp+179753@code.launchpad.net

Description of the change

Bump version to 1.6.2 after release.

To post a comment you must log in.
2736. By Nathan Williams

Bump version to 1.6.2

2737. By Nathan Williams

Fix parser reference

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/akserver'
2--- bin/akserver 2013-03-23 20:30:30 +0000
3+++ bin/akserver 2013-08-12 17:10:21 +0000
4@@ -53,7 +53,7 @@
5
6 infer_jar_file()
7 {
8- local loc_local="${AKIBAN_HOME}/target/akiban-server-1.6.1-SNAPSHOT.jar"
9+ local loc_local="${AKIBAN_HOME}/target/akiban-server-1.6.2-SNAPSHOT.jar"
10 local loc_global="/usr/share/akiban/akiban-server.jar"
11
12 # Only infer if passed no argument
13
14=== modified file 'bin/akserver.cmd'
15--- bin/akserver.cmd 2013-03-23 20:30:30 +0000
16+++ bin/akserver.cmd 2013-08-12 17:10:21 +0000
17@@ -19,7 +19,7 @@
18
19 SETLOCAL
20
21-SET SERVER_JAR=akiban-server-1.6.1-SNAPSHOT.jar
22+SET SERVER_JAR=akiban-server-1.6.2-SNAPSHOT.jar
23 SET SERVICE_NAME=akserver
24 SET SERVICE_DNAME=Akiban Server
25 SET SERVICE_DESC=Akiban Database Server
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2013-03-23 20:30:30 +0000
29+++ debian/changelog 2013-08-12 17:10:21 +0000
30@@ -1,3 +1,9 @@
31+akiban-server (1.6.2) oneiric; urgency=low
32+
33+ * Development Release.
34+
35+ -- Akiban Build User <build@akiban.com> Mon, 12 Aug 2013 12:50:10 -0400
36+
37 akiban-server (1.6.1) oneiric; urgency=low
38
39 * Development Release.
40
41=== modified file 'debian/rules'
42--- debian/rules 2013-03-23 20:30:30 +0000
43+++ debian/rules 2013-08-12 17:10:21 +0000
44@@ -20,15 +20,15 @@
45 dh_install
46
47 # Copy in the jar and symlink to something stable
48- dh_install target/akiban-server-1.6.1-SNAPSHOT.jar \
49+ dh_install target/akiban-server-1.6.2-SNAPSHOT.jar \
50 usr/share/akiban
51- dh_link usr/share/akiban/akiban-server-1.6.1-SNAPSHOT.jar \
52+ dh_link usr/share/akiban/akiban-server-1.6.2-SNAPSHOT.jar \
53 usr/share/akiban/akiban-server.jar
54
55 # Dump tools
56- dh_install packages-common/akiban-client-tools-1.3.6-SNAPSHOT.jar \
57+ dh_install packages-common/akiban-client-tools-1.3.7-SNAPSHOT.jar \
58 usr/share/akiban
59- dh_link usr/share/akiban/akiban-client-tools-1.3.6-SNAPSHOT.jar \
60+ dh_link usr/share/akiban/akiban-client-tools-1.3.7-SNAPSHOT.jar \
61 usr/share/akiban/akiban-client-tools.jar
62
63 # Build architecture-independent files here.
64
65=== modified file 'pom.xml'
66--- pom.xml 2013-08-08 20:45:06 +0000
67+++ pom.xml 2013-08-12 17:10:21 +0000
68@@ -4,7 +4,7 @@
69
70 <groupId>com.akiban</groupId>
71 <artifactId>akiban-server</artifactId>
72- <version>1.6.1-SNAPSHOT</version>
73+ <version>1.6.2-SNAPSHOT</version>
74 <packaging>jar</packaging>
75
76 <name>akiban-server</name>
77@@ -100,7 +100,7 @@
78 <dependency>
79 <groupId>com.akiban</groupId>
80 <artifactId>akiban-sql-parser</artifactId>
81- <version>1.0.16-SNAPSHOT</version>
82+ <version>1.0.17-SNAPSHOT</version>
83 </dependency>
84 <dependency>
85 <groupId>org.slf4j</groupId>
86@@ -122,7 +122,7 @@
87 <dependency>
88 <groupId>com.akiban</groupId>
89 <artifactId>akiban-sql-parser</artifactId>
90- <version>1.0.16-SNAPSHOT</version>
91+ <version>1.0.17-SNAPSHOT</version>
92 <type>test-jar</type>
93 <scope>test</scope>
94 </dependency>
95
96=== modified file 'redhat/akiban-server.spec'
97--- redhat/akiban-server.spec 2013-03-23 20:30:30 +0000
98+++ redhat/akiban-server.spec 2013-08-12 17:10:21 +0000
99@@ -5,7 +5,7 @@
100 %define relname %{name}-%{version}-%{release}
101
102 Name: akiban-server
103-Version: 1.6.1
104+Version: 1.6.2
105 Release: REVISION%{?dist}
106 Epoch: EPOCH
107 Summary: Akiban Server is the main server for the Akiban Orthogonal Architecture.
108@@ -58,11 +58,11 @@
109 cp -p redhat/akiban-server ${RPM_BUILD_ROOT}/etc/rc.d/init.d/
110 cp -p redhat/LICENSE.txt ${RPM_BUILD_ROOT}/usr/share/%{username}
111
112-cp -p target/akiban-server-1.6.1-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}
113-ln -s /usr/share/%{username}/akiban-server-1.6.1-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}/akiban-server.jar
114+cp -p target/akiban-server-1.6.2-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}
115+ln -s /usr/share/%{username}/akiban-server-1.6.2-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}/akiban-server.jar
116 cp -p target/dependency/* ${RPM_BUILD_ROOT}/usr/share/%{username}/server
117-cp -p redhat/akiban-client-tools-1.3.6-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}
118-ln -s /usr/share/%{username}/akiban-client-tools-1.3.6-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}/akiban-client-tools.jar
119+cp -p redhat/akiban-client-tools-1.3.7-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}
120+ln -s /usr/share/%{username}/akiban-client-tools-1.3.7-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}/akiban-client-tools.jar
121 cp -p redhat/client/* ${RPM_BUILD_ROOT}/usr/share/%{username}/client
122 cp -pR redhat/plugins/ ${RPM_BUILD_ROOT}/usr/share/%{username}/
123
124
125=== modified file 'redhat/akiban.spec'
126--- redhat/akiban.spec 2013-03-23 20:30:30 +0000
127+++ redhat/akiban.spec 2013-08-12 17:10:21 +0000
128@@ -1,5 +1,5 @@
129 Name: akiban
130-Version: 1.6.1
131+Version: 1.6.2
132 Release: 1
133 Summary: Akiban Technologies stack.
134 Group: Applications/Databases

Subscribers

People subscribed via source and target branches

to all changes: