Checking if cassandra is running, before making nodetool connect call.
Updating release version
Merge pull request #186 from sagarl/1.1.a

Checking if cassandra is running, before making nodetool connect call.
Updating Max num of retries in BoundedExponentialRetryCallable
Merge pull request #187 from sagarl/1.1.a

Updating Max num of retries in BoundedExponentialRetryCallable
ignore maven dirs
rev number
rev number
changing org name for libthrift
rev number
Eliminating the fixed caching of seeds; cache is never updated. Any updates to seeds (as discocvered by priam) won't be reflected with the cache in the way.
rev number
Merge pull request #201 from jasobrown/1.1.a

Eliminating the fixed caching of seeds in NFSeedProvider
fixing rev number
Enabling Cassandra to start manually
Merge pull request #209 from sagarl/1.1.a

Enabling Cassandra to start manually
Merge pull request #228 from jasobrown/1.1

(#227) transition to guice's @ImplementedBy annotation

reviewed by @timiblossom
Merge branch '1.1.a' into 1.1

Conflicts:
	gradle.properties
	priam/src/main/java/com/netflix/priam/IConfiguration.java
	priam/src/main/java/com/netflix/priam/PriamServer.java
	priam/src/main/java/com/netflix/priam/defaultimpl/PriamConfiguration.java
	priam/src/main/java/com/netflix/priam/resources/CassandraAdmin.java
	priam/src/test/java/com/netflix/priam/FakeConfiguration.java
Merge pull request #230 from jasobrown/1.1

Merge 1.1.a into 1.1

reviewed by @timiblossom
Merge branch '1.1'

Conflicts:
	priam/src/main/java/com/netflix/priam/defaultimpl/PriamConfiguration.java
	priam/src/test/java/com/netflix/priam/FakeConfiguration.java