commit 561a1cd883346b6b6726ad3a4a5199cf696f2b99
Author: zznate
Date: Wed Mar 31 17:03:28 2010 -0700
updated javadoc example for cassandraHostConfigurator
.../cassandra/service/CassandraClientPool.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
commit 3a8b6bcae850a1ccc61e5fd1dca660fc361b6e0e
Author: zznate
Date: Wed Mar 31 13:19:32 2010 -0700
refactorings for new CassandraHost and related configurator classes
.../cassandra/service/CassandraClientFactory.java | 30 ++++---
.../service/CassandraClientMonitorMBean.java | 2 +-
.../service/CassandraClientPoolByHost.java | 7 --
.../service/CassandraClientPoolByHostImpl.java | 44 ++++-----
.../service/CassandraClientPoolFactory.java | 4 +-
.../cassandra/service/CassandraClientPoolImpl.java | 99 +++----------------
.../service/CassandraClientPoolByHostTest.java | 12 ++-
.../cassandra/service/CassandraClientPoolTest.java | 14 ++-
.../cassandra/service/CassandraClientTest.java | 2 +-
.../cassandra/service/KeyspaceTest.java | 2 +-
src/test/resources/cassandra-context-test.xml | 10 +-
11 files changed, 78 insertions(+), 148 deletions(-)
commit 23306e9a55787f706f64eae642ed962764222b07
Author: zznate
Date: Wed Mar 31 13:18:27 2010 -0700
extracted exhausted policy enum, encapsulate details of a host into a top-level object
.../cassandra/service/CassandraHost.java | 171 ++++++++++++++++++++
.../service/CassandraHostConfigurator.java | 58 +++++++
.../cassandra/service/ExhaustedPolicy.java | 8 +
.../service/CassandraHostConfiguratorTest.java | 48 ++++++
4 files changed, 285 insertions(+), 0 deletions(-)
~/dev/cassandra/hector $ git co 0.6.0
Switched to branch '0.6.0'
~/dev/cassandra/hector $ git cherry-pick -xs 23306e9a55787f706f64eae642ed962764222b07
Finished one cherry-pick.
[0.6.0 8690dbe] extracted exhausted policy enum, encapsulate details of a host into a top-level object (cherry picked from commit 23306e9a55787f706f64eae642ed962764222b07)
4 files changed, 285 insertions(+), 0 deletions(-)
create mode 100644 src/main/java/me/prettyprint/cassandra/service/CassandraHost.java
create mode 100644 src/main/java/me/prettyprint/cassandra/service/CassandraHostConfigurator.java
create mode 100644 src/main/java/me/prettyprint/cassandra/service/ExhaustedPolicy.java
create mode 100644 src/test/java/me/prettyprint/cassandra/service/CassandraHostConfiguratorTest.java
~/dev/cassandra/hector $ git log
commit 8690dbe7a131f7adfa1272561ee9904f83112a9a
Author: zznate
Date: Wed Mar 31 13:18:27 2010 -0700
extracted exhausted policy enum, encapsulate details of a host into a top-level object
(cherry picked from commit 23306e9a55787f706f64eae642ed962764222b07)
Signed-off-by: Ran Tavory
commit c339e439d643da662e1f3792a88439f4877ee90c
Author: Arin Sarkissian
Date: Wed Mar 31 20:20:55 2010 -0700
bring hector up to date with cassandra 0.6rc1
~/dev/cassandra/hector $ git cherry-pick -xs 3a8b6bcae850a1ccc61e5fd1dca660fc361b6e0e
Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result.
When commiting, use the option '-c 3a8b6bc' to retain authorship and message.
~/dev/cassandra/hector $ git st
src/main/java/me/prettyprint/cassandra/service/CassandraClientMonitorMBean.java: needs merge
src/test/java/me/prettyprint/cassandra/service/KeyspaceTest.java: needs merge
# On branch 0.6.0
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: src/main/java/me/prettyprint/cassandra/service/CassandraClientFactory.java
# modified: src/main/java/me/prettyprint/cassandra/service/CassandraClientPoolByHost.java
# modified: src/main/java/me/prettyprint/cassandra/service/CassandraClientPoolByHostImpl.java
# modified: src/main/java/me/prettyprint/cassandra/service/CassandraClientPoolFactory.java
# modified: src/main/java/me/prettyprint/cassandra/service/CassandraClientPoolImpl.java
# modified: src/test/java/me/prettyprint/cassandra/service/CassandraClientPoolByHostTest.java
# modified: src/test/java/me/prettyprint/cassandra/service/CassandraClientPoolTest.java
# modified: src/test/java/me/prettyprint/cassandra/service/CassandraClientTest.java
# modified: src/test/resources/cassandra-context-test.xml
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# unmerged: src/main/java/me/prettyprint/cassandra/service/CassandraClientMonitorMBean.java
# unmerged: src/test/java/me/prettyprint/cassandra/service/KeyspaceTest.java
#
Oops, there's a merge conflict.
Now, edit the files CassandraClientMonitorMBean and KeyspaceTest and fix the merge. When done, commit with -c 3a8b6bc
~/dev/cassandra/hector $ vi src/main/java/me/prettyprint/cassandra/service/CassandraClientMonitorMBean.java
~/dev/cassandra/hector $ vi src/main/java/me/prettyprint/cassandra/service/KeyspaceTest.java
~/dev/cassandra/hector $ git add .
~/dev/cassandra/hector $ git ci -c 3a8b6bc
[0.6.0 2687509] refactorings for new CassandraHost and related configurator classes
11 files changed, 108 insertions(+), 177 deletions(-)
~/dev/cassandra/hector $ git cherry-pick -xs 561a1cd883346b6b6726ad3a4a5199cf696f2b99
Finished one cherry-pick.
[0.6.0 b6cc83a] updated javadoc example for cassandraHostConfigurator (cherry picked from commit 561a1cd883346b6b6726ad3a4a5199cf696f2b99)
1 files changed, 5 insertions(+), 5 deletions(-)
~/dev/cassandra/hector $ git log
commit b6cc83a2ed496dcaf1fa7bd46dc23c2289fb978b
Author: zznate
Date: Wed Mar 31 17:03:28 2010 -0700
updated javadoc example for cassandraHostConfigurator
(cherry picked from commit 561a1cd883346b6b6726ad3a4a5199cf696f2b99)
Signed-off-by: Ran Tavory
commit 2687509b42aeb921c2487b80358f19c55e161168
Author: zznate
Date: Wed Mar 31 13:19:32 2010 -0700
refactorings for new CassandraHost and related configurator classes
commit 8690dbe7a131f7adfa1272561ee9904f83112a9a
Author: zznate
Date: Wed Mar 31 13:18:27 2010 -0700
extracted exhausted policy enum, encapsulate details of a host into a top-level object
(cherry picked from commit 23306e9a55787f706f64eae642ed962764222b07)
Signed-off-by: Ran Tavory
And now run tests make sure everything's good, and we're done.