You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/05/18 04:39:01 UTC

[1/5] cassandra git commit: deb version

Repository: cassandra
Updated Branches:
  refs/heads/trunk 7c673393d -> 8825dee9d


deb version


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

Branch: refs/heads/trunk
Commit: c38968d7e0a7ceb754cacdb3094c081445950224
Parents: 8704006
Author: T Jake Luciani <ja...@apache.org>
Authored: Sun May 17 21:35:38 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Sun May 17 21:35:38 2015 -0400

----------------------------------------------------------------------
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c38968d7/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 8075460..0867ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.2.0-beta1) unstable; urgency=medium
+
+  * New Beta Release 
+
+ -- Jake Luciani <ja...@apache.org>  Sun, 17 May 2015 21:33:49 -0400
+
 cassandra (2.1.4) unstable; urgency=medium
 
   * New release


[3/5] cassandra git commit: debian should use ~

Posted by ja...@apache.org.
debian should use ~


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

Branch: refs/heads/trunk
Commit: 1735249ebfdbf139ca95507d591a324dfe81da33
Parents: 3add8fb
Author: T Jake Luciani <ja...@apache.org>
Authored: Sun May 17 22:21:49 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Sun May 17 22:21:49 2015 -0400

----------------------------------------------------------------------
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1735249e/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 0867ebd..b74027d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cassandra (2.2.0-beta1) unstable; urgency=medium
+cassandra (2.2.0~beta1) unstable; urgency=medium
 
   * New Beta Release 
 


[5/5] cassandra git commit: Merge branch 'cassandra-2.2' into trunk

Posted by ja...@apache.org.
Merge branch 'cassandra-2.2' into trunk

Conflicts:
	debian/changelog


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

Branch: refs/heads/trunk
Commit: 8825dee9dbf1b78e6acbc38bfec41ff3d3a75671
Parents: 003925a 1735249
Author: T Jake Luciani <ja...@apache.org>
Authored: Sun May 17 22:38:06 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Sun May 17 22:38:06 2015 -0400

----------------------------------------------------------------------
 debian/cassandra.install | 1 -
 debian/changelog         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------



[4/5] cassandra git commit: deb version

Posted by ja...@apache.org.
deb version


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

Branch: refs/heads/trunk
Commit: 003925ab46bd2a553adcbc19b7463df31b91d5ef
Parents: 7c67339
Author: T Jake Luciani <ja...@apache.org>
Authored: Sun May 17 21:35:38 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Sun May 17 22:35:52 2015 -0400

----------------------------------------------------------------------
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/003925ab/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 8075460..0867ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.2.0-beta1) unstable; urgency=medium
+
+  * New Beta Release 
+
+ -- Jake Luciani <ja...@apache.org>  Sun, 17 May 2015 21:33:49 -0400
+
 cassandra (2.1.4) unstable; urgency=medium
 
   * New release


[2/5] cassandra git commit: Remove file from deb rules

Posted by ja...@apache.org.
Remove file from deb rules


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

Branch: refs/heads/trunk
Commit: 3add8fbc70838d47563e9c815c1e85555d717372
Parents: c38968d
Author: T Jake Luciani <ja...@apache.org>
Authored: Sun May 17 21:59:48 2015 -0400
Committer: T Jake Luciani <ja...@apache.org>
Committed: Sun May 17 21:59:48 2015 -0400

----------------------------------------------------------------------
 debian/cassandra.install | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3add8fbc/debian/cassandra.install
----------------------------------------------------------------------
diff --git a/debian/cassandra.install b/debian/cassandra.install
index 7f5aa10..a505e15 100644
--- a/debian/cassandra.install
+++ b/debian/cassandra.install
@@ -1,4 +1,3 @@
-conf/cassandra-topology.yaml etc/cassandra
 conf/cassandra.yaml etc/cassandra
 conf/cassandra-env.sh etc/cassandra
 conf/cassandra-rackdc.properties etc/cassandra