Skip to content

Commit

Permalink
Update version number to 2.6.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
xfxyjwf committed Oct 21, 2014
1 parent 20e0a61 commit bba8365
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
2014-10-09 version 2.6.1rc1:
2014-10-20 version 2.6.1:

C++
* Added atomicops support for Solaris.
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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],[[email protected]],[protobuf])
AC_INIT([Protocol Buffers],[2.6.1],[[email protected]],[protobuf])

AM_MAINTAINER_MODE([enable])

Expand Down
4 changes: 2 additions & 2 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def run(self):
))

setup(name = 'protobuf',
version = '2.6.1rc1',
version = '2.6.1',
packages = [ 'google' ],
namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite',
Expand Down

0 comments on commit bba8365

Please sign in to comment.