Author: jbellis
Date: Wed Dec 29 19:48:44 2010
New Revision: 1053719
URL: http://svn.apache.org/viewvc?rev=1053719&view=rev
Log:
edit 1867 CHANGES entry to rc3
Modified:
cassandra/branches/cassandra-0.7.0/CHANGES.txt
cassandra/branches/cassandra-0.7.0/redhat/apache-cassandra.spec
Modified: cassandra/branches/cassandra-0.7.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/CHANGES.txt?rev=1053719&r1=1053718&r2=1053719&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7.0/CHANGES.txt Wed Dec 29 19:48:44 2010
@@ -12,7 +12,6 @@ dev
* increased amount of index locks for faster commitlog replay
* collect secondary index tombstones immediately (CASSANDRA-1914)
* revert commitlog changes from #1780 (CASSANDRA-1917)
- * large row support for SSTableExport (CASSANDRA-1867)
* examine the right nibble when validating TimeUUID (CASSANDRA-1910)
@@ -36,6 +35,7 @@ dev
is requested (CASSANDRA-1866)
* flush before repair (CASSANDRA-1748)
* SSTableExport validates key order (CASSANDRA-1884)
+ * large row support for SSTableExport (CASSANDRA-1867)
* Re-cache hot keys post-compaction without hitting disk (CASSANDRA-1878)
* manage read repair in coordinator instead of data source, to
provide latency information to dynamic snitch (CASSANDRA-1873)
Modified: cassandra/branches/cassandra-0.7.0/redhat/apache-cassandra.spec
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7.0/redhat/apache-cassandra.spec?rev=1053719&r1=1053718&r2=1053719&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7.0/redhat/apache-cassandra.spec (original)
+++ cassandra/branches/cassandra-0.7.0/redhat/apache-cassandra.spec Wed Dec 29
19:48:44 2010
@@ -62,6 +62,9 @@ mkdir -p %{buildroot}/usr/sbin
mkdir -p %{buildroot}/usr/bin
cp -p conf/* %{buildroot}/etc/%{username}/default.conf
cp -p conf/* %{buildroot}/usr/share/%{username}/default.conf
+# step on default config with our redhat one
+cp -p redhat/cassandra.in.sh %{buildroot}/etc/%{username}/default.conf
+cp -p redhat/cassandra.in.sh %{buildroot}/usr/share/%{username}/default.conf
cp -p redhat/%{username} %{buildroot}/etc/rc.d/init.d/
cp -p redhat/%{username}.conf %{buildroot}/etc/security/limits.d/
cp -p redhat/default %{buildroot}/etc/default/%{username}
