dropped go 1.1, added go 1.3 and tip

Artem-2 · Jul 16, 2014 · 8a46f2c · 8a46f2c
1 parent 162ac03
commit 8a46f2c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 36 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
 language: go
 
 go:
-  - 1.1
   - 1.2
+  - 1.3
+  - tip
 
 script:
   - bash integration.sh

diff --git a/README.md b/README.md
@@ -13,6 +13,8 @@ Project Website: http://gocql.github.io/<br>
 API documentation: http://godoc.org/github.com/gocql/gocql<br>
 Discussions: https://groups.google.com/forum/#!forum/gocql
 
+Supported Versions: Cassandra 1.2, 2.0, 2.1; Go 1.2, 1.3
+
 Installation
 ------------
 
@@ -22,7 +24,7 @@ Installation
 Features
 --------
 
-* Modern Cassandra client for Cassandra 1.2 and 2.0
+* Modern Cassandra client using the native transport
 * Automatic type conversations between Cassandra and Go
   * Support for all common types including sets, lists and maps
   * Custom types can implement a `Marshaler` and `Unmarshaler` interface

diff --git a/conn.go b/conn.go
@@ -606,6 +606,19 @@ func (c *Conn) decodeFrame(f frame, trace Tracer) (rval interface{}, err error)
 	}
 }
 
+func (c *Conn) setKeepalive(d time.Duration) error {
+	if tc, ok := c.conn.(*net.TCPConn); ok {
+		err := tc.SetKeepAlivePeriod(d)
+		if err != nil {
+			return err
+		}
+
+		return tc.SetKeepAlive(true)
+	}
+
+	return nil
+}
+
 type queryInfo struct {
 	id   []byte
 	args []ColumnInfo

diff --git a/conn_go11.go b/conn_go11.go
diff --git a/conn_go12.go b/conn_go12.go