diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-20 17:06:06 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-10-20 17:06:06 -0700 |
| commit | bba83652e1be610bdb7ee1566ad18346d98b843c (patch) | |
| tree | b68ff8bd7291c0760047eb5e7c6cfad5633a34a3 | |
| parent | 20e0a61ff6237709b285daec4337fd241e578dd2 (diff) | |
| download | protobuf-bba83652e1be610bdb7ee1566ad18346d98b843c.tar.gz protobuf-bba83652e1be610bdb7ee1566ad18346d98b843c.tar.bz2 protobuf-bba83652e1be610bdb7ee1566ad18346d98b843c.zip | |
Update version number to 2.6.1.v2.6.1
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | java/pom.xml | 4 | ||||
| -rwxr-xr-x | python/setup.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index affc419b..0d0ac814 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 ba408af3..c07067cf 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) diff --git a/java/pom.xml b/java/pom.xml index 0d9779ff..2e68b0ee 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 91565c18..2450a774 100755 --- a/python/setup.py +++ b/python/setup.py @@ -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', |