Commit bba83652 authored by Feng Xiao's avatar Feng Xiao

Update version number to 2.6.1.

parent 20e0a61f
2014-10-09 version 2.6.1rc1: 2014-10-20 version 2.6.1:
C++ C++
* Added atomicops support for Solaris. * Added atomicops support for Solaris.
......
...@@ -12,7 +12,7 @@ AC_PREREQ(2.59) ...@@ -12,7 +12,7 @@ AC_PREREQ(2.59)
# In the SVN trunk, the version should always be the next anticipated release # In the SVN trunk, the version should always be the next anticipated release
# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed # version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
# the size of one file name in the dist tarfile over the 99-char limit.) # the size of one file name in the dist tarfile over the 99-char limit.)
AC_INIT([Protocol Buffers],[2.6.1rc1],[protobuf@googlegroups.com],[protobuf]) AC_INIT([Protocol Buffers],[2.6.1],[protobuf@googlegroups.com],[protobuf])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</parent> </parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>2.6.1rc1</version> <version>2.6.1</version>
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>Protocol Buffer Java API</name> <name>Protocol Buffer Java API</name>
<description> <description>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
<instructions> <instructions>
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL> <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
<Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName> <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
<Export-Package>com.google.protobuf;version=2.6.1rc1</Export-Package> <Export-Package>com.google.protobuf;version=2.6.1</Export-Package>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
......
...@@ -156,7 +156,7 @@ if __name__ == '__main__': ...@@ -156,7 +156,7 @@ if __name__ == '__main__':
)) ))
setup(name = 'protobuf', setup(name = 'protobuf',
version = '2.6.1rc1', version = '2.6.1',
packages = [ 'google' ], packages = [ 'google' ],
namespace_packages = [ 'google' ], namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite', test_suite = 'setup.MakeTestSuite',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment