[1/2] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-13 Thread dbrosius 
Updated Branches:
  refs/heads/trunk cee521477 -> 40599fe4d


Merge branch 'cassandra-1.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40599fe4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40599fe4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40599fe4

Branch: refs/heads/trunk
Commit: 40599fe4d429b5664b51dad388406b2339c247cd
Parents: cee5214 5dc145f
Author: Dave Brosius 
Authored: Wed Nov 14 00:51:04 2012 -0500
Committer: Dave Brosius 
Committed: Wed Nov 14 00:51:04 2012 -0500

--
 .../cassandra/db/BlacklistedDirectories.java   |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--

[1/2] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-12 Thread slebresne 
Updated Branches:
  refs/heads/trunk 563417451 -> a007e1b5f


Merge branch 'cassandra-1.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a007e1b5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a007e1b5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a007e1b5

Branch: refs/heads/trunk
Commit: a007e1b5f8fd71d572041fdff5abb2d70d66363b
Parents: 5634174 9118764
Author: Sylvain Lebresne 
Authored: Mon Nov 12 12:20:06 2012 +0100
Committer: Sylvain Lebresne 
Committed: Mon Nov 12 12:20:06 2012 +0100

--
 src/java/org/apache/cassandra/cli/CliClient.java |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
--

[1/2] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-11 Thread slebresne 
Updated Branches:
  refs/heads/trunk 9e60586d6 -> 563417451


Merge branch 'cassandra-1.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56341745
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56341745
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56341745

Branch: refs/heads/trunk
Commit: 563417451465139ac21298984745f700329c78b3
Parents: 9e60586 020a837
Author: Sylvain Lebresne 
Authored: Mon Nov 12 08:26:11 2012 +0100
Committer: Sylvain Lebresne 
Committed: Mon Nov 12 08:26:11 2012 +0100

--
 README.txt |   11 +--
 1 files changed, 5 insertions(+), 6 deletions(-)
--