You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/07/03 20:49:40 UTC
[1/2] git commit: Add conf/hotspot_compiler to .gitignore
Repository: cassandra
Updated Branches:
refs/heads/trunk f20b09782 -> b00a08252
Add conf/hotspot_compiler to .gitignore
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4781e595
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4781e595
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4781e595
Branch: refs/heads/trunk
Commit: 4781e5952ef5963cc5d506140ae121e20ab1e0c3
Parents: 3be63dd
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jul 3 21:49:05 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jul 3 21:49:05 2014 +0300
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4781e595/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 765cfed..c7cf9fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ src/gen-java/
src/resources/org/apache/cassandra/config/
logs/
data/
+conf/hotspot_compiler
# C* debs
build-stamp
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b00a0825
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b00a0825
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b00a0825
Branch: refs/heads/trunk
Commit: b00a08252ae42b8eb2aae19e0f59e1bc35359e5d
Parents: f20b097 4781e59
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jul 3 21:49:32 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jul 3 21:49:32 2014 +0300
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------