You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/06/10 03:16:23 UTC

[1/2] git commit: add logs/ and data/ to .gitignore

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 aa9894df4 -> bb58d80d1


add logs/ and data/ to .gitignore


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

Branch: refs/heads/cassandra-2.0
Commit: 19a207767ca4d7436c120cef16a3a5db4c1d8d43
Parents: 47edb3c
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Jun 9 21:14:58 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Jun 9 21:14:58 2014 -0400

----------------------------------------------------------------------
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/19a20776/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8013e30..8dfa07c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 build/
 src/gen-java/
 src/resources/org/apache/cassandra/config/
+logs/
+data/
 
 # C* debs
 build-stamp

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

Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/cassandra-2.0
Commit: bb58d80d1790facb554501bbee6a9d00fcae2381
Parents: aa9894d 19a2077
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Jun 9 21:15:29 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Mon Jun 9 21:15:29 2014 -0400

----------------------------------------------------------------------
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------