1. moved test resources to test data folder and made related changes to tests, 2. add to AUTHOR, 3. removed contents of my .gitignore as requested

.gitignore

@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof

AUTHORS

@@ -31,3 +31,4 @@ Muir Manders <muir@retailnext.net>
 Sankar P <sankar.curiosity@gmail.com>
 Julien Da Silva <julien.dasilva@gmail.com>
 Dan Kennedy <daniel@firstcs.co.uk>
+Nick Dhupia<nick.dhupia@gmail.com>

integration.sh

@@ -30,8 +30,9 @@ function run_tests() {
 	fi
 	ccm clear
 
-    cp -f resources/conf/cassandra.yaml ~/.ccm/repository/$version/conf/
-    ###### updateconf is necessary here so the yaml file gets loaded
+	#cannot do this due to https://github.com/pcmanus/ccm/issues/171
+	#ccm updateconf -y testdata/cassandra.yaml
+	cp -f testdata/cassandra.yaml ~/.ccm/repository/$version/conf/
 	ccm updateconf
     ccm start
     ccm status

resources/conf/cassandra.yaml → testdata/cassandra.yaml

@@ -639,11 +639,11 @@ server_encryption_options:
 # enable or disable client/server encryption.
 client_encryption_options:
     enabled: true
-    keystore: resources/conf/pki/.keystore
+    keystore: testdata/pki/.keystore
     keystore_password: cassandra
     require_client_auth: true
     # Set trustore and truststore_password if require_client_auth is true
-    truststore: resources/conf/pki/.truststore
+    truststore: testdata/pki/.truststore
     truststore_password: cassandra
     # More advanced defaults below:
     # protocol: TLS
@@ -661,4 +661,4 @@ internode_compression: all
 # Disabling it will result in larger (but fewer) network packets being sent,
 # reducing overhead from the TCP protocol itself, at the cost of increasing
 # latency if you block for cross-datacenter responses.
-inter_dc_tcp_nodelay: true
+inter_dc_tcp_nodelay: true

wiki_test.go

@@ -25,9 +25,9 @@ func init() {
 var createSslCluster = func() *ClusterConfig {
 	cluster := cf()
 	cluster.SslOpts = &SslOptions{
-		CertPath:               "resources/conf/pki/gocql.crt",
-		KeyPath:                "resources/conf/pki/gocql.key",
-		CaPath:                 "resources/conf/pki/ca.crt",
+		CertPath:               "testdata/pki/gocql.crt",
+		KeyPath:                "testdata/pki/gocql.key",
+		CaPath:                 "testdata/pki/ca.crt",
 		EnableHostVerification: false,
 	}
 	return cluster