Update version number to 2.6.1.

This commit is contained in:
Feng Xiao 2014-10-20 17:06:06 -07:00
parent 20e0a61ff6
commit bba83652e1
4 changed files with 5 additions and 5 deletions

View File

@ -1,4 +1,4 @@
2014-10-09 version 2.6.1rc1:
2014-10-20 version 2.6.1:
C++
* Added atomicops support for Solaris.

View File

@ -12,7 +12,7 @@ AC_PREREQ(2.59)
# 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
# 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])

View File

@ -10,7 +10,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.6.1rc1</version>
<version>2.6.1</version>
<packaging>bundle</packaging>
<name>Protocol Buffer Java API</name>
<description>
@ -148,7 +148,7 @@
<instructions>
<Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
<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>
</configuration>
</plugin>

View File

@ -156,7 +156,7 @@ if __name__ == '__main__':
))
setup(name = 'protobuf',
version = '2.6.1rc1',
version = '2.6.1',
packages = [ 'google' ],
namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite',