Back to Apache 2.0 due to warnings from R CMD check

bwlewis · Sep 16, 2013 · e70c69a · e70c69a
1 parent f45da3f
commit e70c69a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -6,5 +6,5 @@ Date: 2013-09-16
 Author: B. W. Lewis
 Maintainer: B. W. Lewis <blewis@illposed.net>
 Description: An R client for the Redis persistent key-value database available from http://redis.io.
-License: BSD_3_clause
+License: Apache License (>= 2.0)
 LazyLoad: yes
diff --git a/NEWS b/NEWS
@@ -1,7 +1,4 @@
 1.6.8:
-- The package author (B W Lewis) has changed the package license from
-  Apache 2.0 to the BSD 3 clause license to bring it in line with the
-  main Redis copyright license.
 - The package now includes support for Redis bit operations thanks to
   conde contributed by Kenny Helsens.
 - Wush Wu helped to add a new performance option on redisConnect to bring the

diff --git a/man/redisGetSet.Rd b/man/redisGetSet.Rd
@@ -3,7 +3,7 @@
 \title{Store a value in Redis, returning the previously defined value.}
 \description{Store a value identified by a character key name 
 in the Redis database, returning the previously defined value or NULL if
-the key was not already associated with a value. 
+the key was not already associated with a value.
 }
 \usage{
 redisGetSet(key, value, ...)

diff --git a/vignettes/rredis.Rnw b/vignettes/rredis.Rnw
@@ -1,6 +1,6 @@
-% \VignetteIndexEntry{rredis Manual}
-% \VignetteDepends{rredis}
-% \VignettePackage{rredis}
+%\VignetteIndexEntry{rredis Manual}
+%\VignetteDepends{rredis}
+%\VignettePackage{rredis}
 \documentclass[12pt]{article}
 \usepackage{amsmath}
 \usepackage[pdftex]{graphicx}