Commit Graph

8 Commits

Author SHA1 Message Date
Gary Dusbabek 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
Jonathan Ellis 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
Eric Evans 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
Jonathan Ellis 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
Gary Dusbabek 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
Eric Evans 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
Eric Evans 32d964ff54 better handling of file names with spaces on windows
- Quote path names in startup bat file
- Pass File object instead of URI when parsing storage-conf.xml

Patch by Michael Greene; reviewed by eevans for CASSANDRA-307

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796345 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 15:21:59 +00:00
Eric Evans 77a5bf429e shiny new windows bat file for daemon startup
Patch by Michael Greene; reviewed by eevans for CASSANDRA-146

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793978 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 17:18:04 +00:00