Akiban Server

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

  1. 1.6.2-update
  2. Merge into 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.
lp:~akiban-technologies/akiban-server/1.6.2-update updated
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
=== modified file 'bin/akserver'
--- bin/akserver 2013-03-23 20:30:30 +0000
+++ bin/akserver 2013-08-12 17:10:21 +0000
@@ -53,7 +53,7 @@
5353
54infer_jar_file()54infer_jar_file()
55{55{
56 local loc_local="${AKIBAN_HOME}/target/akiban-server-1.6.1-SNAPSHOT.jar"56 local loc_local="${AKIBAN_HOME}/target/akiban-server-1.6.2-SNAPSHOT.jar"
57 local loc_global="/usr/share/akiban/akiban-server.jar"57 local loc_global="/usr/share/akiban/akiban-server.jar"
5858
59 # Only infer if passed no argument59 # Only infer if passed no argument
6060
=== modified file 'bin/akserver.cmd'
--- bin/akserver.cmd 2013-03-23 20:30:30 +0000
+++ bin/akserver.cmd 2013-08-12 17:10:21 +0000
@@ -19,7 +19,7 @@
1919
20SETLOCAL20SETLOCAL
2121
22SET SERVER_JAR=akiban-server-1.6.1-SNAPSHOT.jar22SET SERVER_JAR=akiban-server-1.6.2-SNAPSHOT.jar
23SET SERVICE_NAME=akserver23SET SERVICE_NAME=akserver
24SET SERVICE_DNAME=Akiban Server24SET SERVICE_DNAME=Akiban Server
25SET SERVICE_DESC=Akiban Database Server25SET SERVICE_DESC=Akiban Database Server
2626
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-23 20:30:30 +0000
+++ debian/changelog 2013-08-12 17:10:21 +0000
@@ -1,3 +1,9 @@
1akiban-server (1.6.2) oneiric; urgency=low
2
3 * Development Release.
4
5 -- Akiban Build User <build@akiban.com> Mon, 12 Aug 2013 12:50:10 -0400
6
1akiban-server (1.6.1) oneiric; urgency=low7akiban-server (1.6.1) oneiric; urgency=low
28
3 * Development Release.9 * Development Release.
410
=== modified file 'debian/rules'
--- debian/rules 2013-03-23 20:30:30 +0000
+++ debian/rules 2013-08-12 17:10:21 +0000
@@ -20,15 +20,15 @@
20 dh_install20 dh_install
2121
22 # Copy in the jar and symlink to something stable22 # Copy in the jar and symlink to something stable
23 dh_install target/akiban-server-1.6.1-SNAPSHOT.jar \23 dh_install target/akiban-server-1.6.2-SNAPSHOT.jar \
24 usr/share/akiban24 usr/share/akiban
25 dh_link usr/share/akiban/akiban-server-1.6.1-SNAPSHOT.jar \25 dh_link usr/share/akiban/akiban-server-1.6.2-SNAPSHOT.jar \
26 usr/share/akiban/akiban-server.jar26 usr/share/akiban/akiban-server.jar
2727
28 # Dump tools28 # Dump tools
29 dh_install packages-common/akiban-client-tools-1.3.6-SNAPSHOT.jar \29 dh_install packages-common/akiban-client-tools-1.3.7-SNAPSHOT.jar \
30 usr/share/akiban30 usr/share/akiban
31 dh_link usr/share/akiban/akiban-client-tools-1.3.6-SNAPSHOT.jar \31 dh_link usr/share/akiban/akiban-client-tools-1.3.7-SNAPSHOT.jar \
32 usr/share/akiban/akiban-client-tools.jar32 usr/share/akiban/akiban-client-tools.jar
3333
34# Build architecture-independent files here.34# Build architecture-independent files here.
3535
=== modified file 'pom.xml'
--- pom.xml 2013-08-08 20:45:06 +0000
+++ pom.xml 2013-08-12 17:10:21 +0000
@@ -4,7 +4,7 @@
44
5 <groupId>com.akiban</groupId>5 <groupId>com.akiban</groupId>
6 <artifactId>akiban-server</artifactId>6 <artifactId>akiban-server</artifactId>
7 <version>1.6.1-SNAPSHOT</version>7 <version>1.6.2-SNAPSHOT</version>
8 <packaging>jar</packaging>8 <packaging>jar</packaging>
99
10 <name>akiban-server</name>10 <name>akiban-server</name>
@@ -100,7 +100,7 @@
100 <dependency>100 <dependency>
101 <groupId>com.akiban</groupId>101 <groupId>com.akiban</groupId>
102 <artifactId>akiban-sql-parser</artifactId>102 <artifactId>akiban-sql-parser</artifactId>
103 <version>1.0.16-SNAPSHOT</version>103 <version>1.0.17-SNAPSHOT</version>
104 </dependency>104 </dependency>
105 <dependency>105 <dependency>
106 <groupId>org.slf4j</groupId>106 <groupId>org.slf4j</groupId>
@@ -122,7 +122,7 @@
122 <dependency>122 <dependency>
123 <groupId>com.akiban</groupId>123 <groupId>com.akiban</groupId>
124 <artifactId>akiban-sql-parser</artifactId>124 <artifactId>akiban-sql-parser</artifactId>
125 <version>1.0.16-SNAPSHOT</version>125 <version>1.0.17-SNAPSHOT</version>
126 <type>test-jar</type>126 <type>test-jar</type>
127 <scope>test</scope>127 <scope>test</scope>
128 </dependency>128 </dependency>
129129
=== modified file 'redhat/akiban-server.spec'
--- redhat/akiban-server.spec 2013-03-23 20:30:30 +0000
+++ redhat/akiban-server.spec 2013-08-12 17:10:21 +0000
@@ -5,7 +5,7 @@
5%define relname %{name}-%{version}-%{release}5%define relname %{name}-%{version}-%{release}
66
7Name: akiban-server7Name: akiban-server
8Version: 1.6.18Version: 1.6.2
9Release: REVISION%{?dist}9Release: REVISION%{?dist}
10Epoch: EPOCH10Epoch: EPOCH
11Summary: Akiban Server is the main server for the Akiban Orthogonal Architecture.11Summary: Akiban Server is the main server for the Akiban Orthogonal Architecture.
@@ -58,11 +58,11 @@
58cp -p redhat/akiban-server ${RPM_BUILD_ROOT}/etc/rc.d/init.d/58cp -p redhat/akiban-server ${RPM_BUILD_ROOT}/etc/rc.d/init.d/
59cp -p redhat/LICENSE.txt ${RPM_BUILD_ROOT}/usr/share/%{username}59cp -p redhat/LICENSE.txt ${RPM_BUILD_ROOT}/usr/share/%{username}
6060
61cp -p target/akiban-server-1.6.1-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}61cp -p target/akiban-server-1.6.2-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}
62ln -s /usr/share/%{username}/akiban-server-1.6.1-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}/akiban-server.jar62ln -s /usr/share/%{username}/akiban-server-1.6.2-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}/akiban-server.jar
63cp -p target/dependency/* ${RPM_BUILD_ROOT}/usr/share/%{username}/server63cp -p target/dependency/* ${RPM_BUILD_ROOT}/usr/share/%{username}/server
64cp -p redhat/akiban-client-tools-1.3.6-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}64cp -p redhat/akiban-client-tools-1.3.7-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}
65ln -s /usr/share/%{username}/akiban-client-tools-1.3.6-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}/akiban-client-tools.jar65ln -s /usr/share/%{username}/akiban-client-tools-1.3.7-SNAPSHOT.jar ${RPM_BUILD_ROOT}/usr/share/%{username}/akiban-client-tools.jar
66cp -p redhat/client/* ${RPM_BUILD_ROOT}/usr/share/%{username}/client66cp -p redhat/client/* ${RPM_BUILD_ROOT}/usr/share/%{username}/client
67cp -pR redhat/plugins/ ${RPM_BUILD_ROOT}/usr/share/%{username}/67cp -pR redhat/plugins/ ${RPM_BUILD_ROOT}/usr/share/%{username}/
6868
6969
=== modified file 'redhat/akiban.spec'
--- redhat/akiban.spec 2013-03-23 20:30:30 +0000
+++ redhat/akiban.spec 2013-08-12 17:10:21 +0000
@@ -1,5 +1,5 @@
1Name: akiban1Name: akiban
2Version: 1.6.12Version: 1.6.2
3Release: 13Release: 1
4Summary: Akiban Technologies stack.4Summary: Akiban Technologies stack.
5Group: Applications/Databases5Group: Applications/Databases

Subscribers

People subscribed via source and target branches

to all changes: