Skip to content

Commit d2ae7d8

Browse files
committed
Merge pull request #288 from go-redis/fix/rm-go14
Remove Go 1.4 from test build. Bump license.
2 parents fb6ea09 + 46e3a09 commit d2ae7d8

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ services:
55
- redis-server
66

77
go:
8-
- 1.4
98
- 1.5
109
- 1.6
1110
- tip

LICENSE

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Copyright (c) 2012 The Redis Go Client Authors. All rights reserved.
1+
Copyright (c) 2016 The github.com/go-redis/redis Contributors.
2+
All rights reserved.
23

34
Redistribution and use in source and binary forms, with or without
45
modification, are permitted provided that the following conditions are
@@ -10,9 +11,6 @@ notice, this list of conditions and the following disclaimer.
1011
copyright notice, this list of conditions and the following disclaimer
1112
in the documentation and/or other materials provided with the
1213
distribution.
13-
* Neither the name of Google Inc. nor the names of its
14-
contributors may be used to endorse or promote products derived from
15-
this software without specific prior written permission.
1614

1715
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1816
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

0 commit comments

Comments
 (0)