0427c832b0
merge from 0.8
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8.1@1101228 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 21:31:45 +00:00
ebc7278d78
sanitize configuration code. patch by Jon Hermes, reviewed by gdusbabek. CASSANDRA-1906
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082510 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 14:50:32 +00:00
5d768da6c1
compile thrift generated classes to separate jar
...
Patch by eevans; reviewed by tjake for CASSANDRA-1848
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1075609 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 01:32:16 +00:00
deb5fb4b00
compile bytecode to build/classes/main
...
Patch by eevans; reviewed by tjake for CASSANDRA-1848
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1075608 13f79535-47bb-0310-9956-ffa450edef68
2011-03-01 01:31:35 +00:00
a9cbaae12d
merge from 0.7
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1074329 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 22:33:03 +00:00
dd0da7cbbe
fix starting up on Windows when CASSANDRA_HOME contains whitespace
...
patch by Norman Maurer; reviewed by jbellis for CASSANDRA-2237
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1074276 13f79535-47bb-0310-9956-ffa450edef68
2011-02-24 19:54:18 +00:00
269fff789c
merge from 0.7
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1070541 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14 16:06:50 +00:00
fe4fce6b65
forward all arguments to sstablekeys
...
patch by thobbs; reviewed by jbellis for CASSANDRA-2150
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1069238 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10 05:35:47 +00:00
86369f8d63
CASSANDRA-1855 new default jmx port
...
Patch by eevans for CASSANDRA-1855
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1063948 13f79535-47bb-0310-9956-ffa450edef68
2011-01-27 01:29:23 +00:00
7a629a13fd
remove option to launch avro rpc daemon
...
Patch by eevans; reviewed by Jeremy Hanna for CASSANDRA-926
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1059456 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 04:05:49 +00:00
44f0214b1d
merge from 0.7
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1052105 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 23:56:23 +00:00
b17aefbcf5
check log4j configuration for changes every 10s
...
patch by tjake; reviewed by jbellis for CASSANDRA-1525
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1052104 13f79535-47bb-0310-9956-ffa450edef68
2010-12-22 23:53:40 +00:00
930b4658b3
merge w/ 0.7 branch
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1038864 13f79535-47bb-0310-9956-ffa450edef68
2010-11-24 23:04:38 +00:00
049b4ef94e
dos2unix json2sstable
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1038287 13f79535-47bb-0310-9956-ffa450edef68
2010-11-23 19:13:27 +00:00
f6efba90f3
r/m config-converter.bat
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1036289 13f79535-47bb-0310-9956-ffa450edef68
2010-11-17 23:51:56 +00:00
f34e60f7ca
merge from 0.7
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1035022 13f79535-47bb-0310-9956-ffa450edef68
2010-11-14 16:58:58 +00:00
a0fabc5d2b
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1035021 13f79535-47bb-0310-9956-ffa450edef68
2010-11-14 16:55:59 +00:00
727196fa02
merge from 0.7
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1034096 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 20:06:14 +00:00
204aa5ee72
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1033046 13f79535-47bb-0310-9956-ffa450edef68
2010-11-09 15:58:26 +00:00
05331936ba
r/m xml config converter. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1028769 13f79535-47bb-0310-9956-ffa450edef68
2010-10-29 14:32:31 +00:00
7af2abe6ab
update GC settings in cassandra.bat
...
patch by Nate McCall; reviewed by Vladimir Loncar for CASSANDRA-1636
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1025649 13f79535-47bb-0310-9956-ffa450edef68
2010-10-20 17:41:51 +00:00
e97fdb8240
point log4j to log4j-server.properties in cassandra.bat. patch by Vladimir Loncar; reviewed by jbellis for CASSANDRA-1538
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1002198 13f79535-47bb-0310-9956-ffa450edef68
2010-09-28 14:54:29 +00:00
cbb634bdd5
more reasonable max heap for cassandra-cli
...
Patch by eevans for CASSANDRA-1446
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@991062 13f79535-47bb-0310-9956-ffa450edef68
2010-08-31 02:47:53 +00:00
6f2a92bdaa
move JVM_OPTS from cassandra.in.sh to the conf/ dir
...
Patch by Nick Bailey; review by eevans for CASSANDRA-1347
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@982845 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 01:25:07 +00:00
a677749228
tool to import+export schema. patch by Eric Evans and Gary Dusbabek, reviewed by Brandon Williams. CASSANDRA-1133
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@967261 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 20:52:54 +00:00
930645c660
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@966746 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 16:58:28 +00:00
5f21923cda
updating cassandra-cli.bat to work in windows
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@966295 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 16:17:30 +00:00
896e5d5f84
Remove deprecated nodeprobe link
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@964555 13f79535-47bb-0310-9956-ffa450edef68
2010-07-15 19:53:08 +00:00
0398e9fcca
Reduce default stack size for CASSANDRA-1256
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@962394 13f79535-47bb-0310-9956-ffa450edef68
2010-07-09 03:54:04 +00:00
1ccd7a6135
group related jvm options. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@959164 13f79535-47bb-0310-9956-ffa450edef68
2010-06-30 02:05:00 +00:00
44d002221d
hopeful modifications to window batch files. patch by gdusbabek, reviewed by jbellis. CASSANDRA-1110
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@953775 13f79535-47bb-0310-9956-ffa450edef68
2010-06-11 17:11:16 +00:00
a46b3bf548
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947753 13f79535-47bb-0310-9956-ffa450edef68
2010-05-24 18:27:52 +00:00
98dfd97eab
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947143 13f79535-47bb-0310-9956-ffa450edef68
2010-05-21 19:46:37 +00:00
e27df1e559
merging from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947132 13f79535-47bb-0310-9956-ffa450edef68
2010-05-21 19:20:13 +00:00
d0f2a780a0
start script causes flapping when used with runit
...
When started in the foreground, invoke Cassandra using exec so that it
replaces the current shell instead of running it from a sub-shell.
Patch by Cliff Moon; reviewed by eevans for CASSANDRA-1114
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947053 13f79535-47bb-0310-9956-ffa450edef68
2010-05-21 16:10:11 +00:00
e9fd49d190
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@946318 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 18:05:04 +00:00
464a36f67c
merging fixes from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@941481 13f79535-47bb-0310-9956-ffa450edef68
2010-05-05 20:52:30 +00:00
c75230c3a1
add bin/config-convert for xml -> yaml migration. patch by Todd Blose; reviewed by Stu Hood for CASSANDRA-1000
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@936511 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 21:05:34 +00:00
dd787f7fcb
simplify configuration file loading; rename to cassandra.xml
...
patch by jbellis; reviewed by eevans for CASSANDRA-971
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@934505 13f79535-47bb-0310-9956-ffa450edef68
2010-04-15 18:17:42 +00:00
4777fcf6a6
remove old cmd option from usage sysnopsis
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@930974 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 22:41:07 +00:00
06248ea220
merge with 0.6 branch (post-850)
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@927954 13f79535-47bb-0310-9956-ffa450edef68
2010-03-26 16:31:52 +00:00
0298fcabd4
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@924050 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 23:34:16 +00:00
700be6e093
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@921126 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 21:05:29 +00:00
0e6edb5c54
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@919470 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 16:27:53 +00:00
85047d0b65
merge changes from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@915828 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 15:38:18 +00:00
e43ee6fd81
start avro daemon using -a arg to startup script
...
Patch by eevans; reviewed by gdusbabek for CASSANDRA-811
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911990 13f79535-47bb-0310-9956-ffa450edef68
2010-02-19 21:30:36 +00:00
275553c8af
remove JVM debugger options from default cassandra.in.sh
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911841 13f79535-47bb-0310-9956-ffa450edef68
2010-02-19 15:26:04 +00:00
38c981efcc
pass args onto main class from cassandra-cli.bat
...
Patch by Mark Wolfe; reviewed by eevans for CASSANDRA-797
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910787 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 00:32:36 +00:00
23a1787c02
update windows batch file for accumlated changes
...
* match JVM default opts to shell scripts
* update CassandraDaemon package
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910359 13f79535-47bb-0310-9956-ffa450edef68
2010-02-15 22:50:35 +00:00
ef6f0238ef
finish r/m of -f option. use log4j of WARN,stderr so that doesn't get in the way of redirecting stdout.
...
patch by jbellis; reviewed by eevans for CASSANDRA-766
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908652 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 19:53:56 +00:00
Jonathan Ellis