From 46e3a09455a2b17453fbc86ce489ccd9d89ca142 Mon Sep 17 00:00:00 2001 From: Vladimir Mihailenco Date: Sat, 19 Mar 2016 15:45:28 +0200 Subject: [PATCH] Remove Go 1.4 from test build. Bump license. --- .travis.yml | 1 - LICENSE | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index a476a44..e0a2f98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ services: - redis-server go: - - 1.4 - 1.5 - 1.6 - tip diff --git a/LICENSE b/LICENSE index 6855a95..261f1ec 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ -Copyright (c) 2012 The Redis Go Client Authors. All rights reserved. +Copyright (c) 2016 The github.com/go-redis/redis Contributors. +All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -10,9 +11,6 @@ notice, this list of conditions and the following disclaimer. copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT