Commit Graph

11 Commits

Author SHA1 Message Date
Eric Evans a307c17499 Merge branch '1.2' into trunk
Conflicts:
	bin/cassandra
	bin/cassandra-cli
	bin/json2sstable
	bin/nodetool
	bin/sstable2json
	bin/sstablekeys
	bin/sstableloader
2013-07-08 15:25:00 -05:00
Eric Evans 909b2ed1a9 scripts fail when paths contain whitespace
Patch by Amichai Rothman; Reviewed by eevans for CASSANDRA-5338
2013-07-08 14:20:40 -05:00
Aleksey Yeschenko 755328b9c5 Change order of directory searching for c*.in.sh
patch by Benjamin Coverston; reviewed by Ben Gamble for CASSANDRA-3983
2013-02-22 22:30:26 +03:00
Eric Evans 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
Jonathan Ellis 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
Eric Evans 601d939e9b refactor of executeSet() to support super columns
Patch by eevans for CASSANDRA-567

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@887497 13f79535-47bb-0310-9956-ffa450edef68
2009-12-05 05:26:56 +00:00
Eric Evans 3ce6c65281 more flexible handling of JAVA_HOME in startup scripts
Patch by Kay Kay and eevans for CASSANDRA-589

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@885663 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 04:06:06 +00:00
Eric Evans 483bb4f367 add user config to search path (like daemon start script)
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@835991 13f79535-47bb-0310-9956-ffa450edef68
2009-11-13 21:13:38 +00:00
Eric Evans e3ad9d33f6 use consistent mechanisms for setting classpath
Patch by Anthony Molinaro; reviewd by eevans for CASSANDRA-274

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793975 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 17:00:33 +00:00
Jonathan Ellis d800250cbc merge from 0.3 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@780687 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 15:36:59 +00:00
Jonathan Ellis f45bf41259 add cli wrapper and Getting Started section to readme. patch by johano and Eric Evans; reviewed by jbellis for CASSANDRA-117
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770737 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 16:05:13 +00:00