You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/12/26 17:56:24 UTC

[1/6] git commit: add .gitignore patch by Michael Shuler; reviewed by jbellis for CASSANDRA-4899

Updated Branches:
  refs/heads/cassandra-1.2 a58a95ddb -> f219e83b6
  refs/heads/cassandra-2.0 03f4c92d1 -> 1365749e4
  refs/heads/trunk 7c182811b -> 30afda368


add .gitignore
patch by Michael Shuler; reviewed by jbellis for CASSANDRA-4899


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

Branch: refs/heads/cassandra-1.2
Commit: f219e83b6a6e59ce189101d6fe8d4b1c277bfacf
Parents: a58a95d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Dec 26 10:51:29 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Dec 26 10:56:00 2013 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f219e83b/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8013e30
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,55 @@
+.gitignore
+
+# C*
+build/
+src/gen-java/
+src/resources/org/apache/cassandra/config/
+
+# C* debs
+build-stamp
+build.properties
+debian/cassandra*debhelper*
+debian/cassandra.substvars
+debian/cassandra/
+debian/files
+
+# gitignore doesn't help with modified files - you may wish to:
+#   git update-index --assume-unchanged test/data/serialization/2.0/db.RowMutation.bin
+# to undo:
+#   git update-index --no-assume-unchanged test/data/serialization/2.0/db.RowMutation.bin
+
+# IntelliJ
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# Eclipse
+.classpath
+.project
+.metadata
+.settings/
+local.properties
+
+# Cscope
+cscope.*
+
+# NetBeans
+nbbuild/
+nbdist/
+nbproject/
+nb-configuration.xml
+nbactions.xml
+
+# Maven, etc.
+out/
+target/
+
+# General
+*.pyc
+*~
+*.bak
+*.sw[o,p]
+*.tmp
+.DS_Store
+Thumbs.db

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

Posted by jb...@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/1365749e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1365749e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1365749e

Branch: refs/heads/cassandra-2.0
Commit: 1365749e456ac674c35633141a08dcf1db06599b
Parents: 03f4c92 f219e83
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Dec 26 10:56:08 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Dec 26 10:56:08 2013 -0600

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

[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 30afda36822a5d4783fe22ad93a65337e2b32bf7
Parents: 7c18281 1365749
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Dec 26 10:56:16 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Dec 26 10:56:16 2013 -0600

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

[2/6] git commit: add .gitignore patch by Michael Shuler; reviewed by jbellis for CASSANDRA-4899

Posted by jb...@apache.org.
add .gitignore
patch by Michael Shuler; reviewed by jbellis for CASSANDRA-4899


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

Branch: refs/heads/cassandra-2.0
Commit: f219e83b6a6e59ce189101d6fe8d4b1c277bfacf
Parents: a58a95d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Dec 26 10:51:29 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Dec 26 10:56:00 2013 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f219e83b/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8013e30
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,55 @@
+.gitignore
+
+# C*
+build/
+src/gen-java/
+src/resources/org/apache/cassandra/config/
+
+# C* debs
+build-stamp
+build.properties
+debian/cassandra*debhelper*
+debian/cassandra.substvars
+debian/cassandra/
+debian/files
+
+# gitignore doesn't help with modified files - you may wish to:
+#   git update-index --assume-unchanged test/data/serialization/2.0/db.RowMutation.bin
+# to undo:
+#   git update-index --no-assume-unchanged test/data/serialization/2.0/db.RowMutation.bin
+
+# IntelliJ
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# Eclipse
+.classpath
+.project
+.metadata
+.settings/
+local.properties
+
+# Cscope
+cscope.*
+
+# NetBeans
+nbbuild/
+nbdist/
+nbproject/
+nb-configuration.xml
+nbactions.xml
+
+# Maven, etc.
+out/
+target/
+
+# General
+*.pyc
+*~
+*.bak
+*.sw[o,p]
+*.tmp
+.DS_Store
+Thumbs.db

[3/6] git commit: add .gitignore patch by Michael Shuler; reviewed by jbellis for CASSANDRA-4899

Posted by jb...@apache.org.
add .gitignore
patch by Michael Shuler; reviewed by jbellis for CASSANDRA-4899


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

Branch: refs/heads/trunk
Commit: f219e83b6a6e59ce189101d6fe8d4b1c277bfacf
Parents: a58a95d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Dec 26 10:51:29 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Dec 26 10:56:00 2013 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f219e83b/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8013e30
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,55 @@
+.gitignore
+
+# C*
+build/
+src/gen-java/
+src/resources/org/apache/cassandra/config/
+
+# C* debs
+build-stamp
+build.properties
+debian/cassandra*debhelper*
+debian/cassandra.substvars
+debian/cassandra/
+debian/files
+
+# gitignore doesn't help with modified files - you may wish to:
+#   git update-index --assume-unchanged test/data/serialization/2.0/db.RowMutation.bin
+# to undo:
+#   git update-index --no-assume-unchanged test/data/serialization/2.0/db.RowMutation.bin
+
+# IntelliJ
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# Eclipse
+.classpath
+.project
+.metadata
+.settings/
+local.properties
+
+# Cscope
+cscope.*
+
+# NetBeans
+nbbuild/
+nbdist/
+nbproject/
+nb-configuration.xml
+nbactions.xml
+
+# Maven, etc.
+out/
+target/
+
+# General
+*.pyc
+*~
+*.bak
+*.sw[o,p]
+*.tmp
+.DS_Store
+Thumbs.db

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

Posted by jb...@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/1365749e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1365749e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1365749e

Branch: refs/heads/trunk
Commit: 1365749e456ac674c35633141a08dcf1db06599b
Parents: 03f4c92 f219e83
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Dec 26 10:56:08 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Dec 26 10:56:08 2013 -0600

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