Update version number to 2.6.1.
diff --git a/CHANGES.txt b/CHANGES.txt
index affc419..0d0ac81 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-2014-10-09 version 2.6.1rc1:
+2014-10-20 version 2.6.1:
C++
* Added atomicops support for Solaris.
diff --git a/configure.ac b/configure.ac
index ba408af..c07067c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
# 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])
diff --git a/java/pom.xml b/java/pom.xml
index 0d9779f..2e68b0e 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -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>
diff --git a/python/setup.py b/python/setup.py
index 91565c1..2450a77 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -156,7 +156,7 @@
))
setup(name = 'protobuf',
- version = '2.6.1rc1',
+ version = '2.6.1',
packages = [ 'google' ],
namespace_packages = [ 'google' ],
test_suite = 'setup.MakeTestSuite',