Commit Graph

44 Commits

Author SHA1 Message Date
Joshua McKenzie e1fc0e0671 Fix failure to start with space in directory name on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
2015-09-03 12:39:43 -04:00
T Jake Luciani b8717dc201 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cassandra.bat
	build.xml
	conf/cassandra-env.sh
	src/java/org/apache/cassandra/service/CassandraDaemon.java
2015-04-01 11:11:53 -04:00
T Jake Luciani c041ea8b37 Bind JMX to localhost unless explicitly configured otherwise 2015-03-30 09:38:50 -04:00
Robert Stupp e13121318b Validate functionality of different JSR-223 providers in UDFs.
patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7874
2014-11-26 12:51:37 -08:00
Tyler Hobbs 699a69de8d Merge branch 'cassandra-2.1' into trunk 2014-11-21 15:40:53 -06:00
blerer 1bb2dd906c Fix size calculations for prepared statements
Patch by Benjamin Lerer; reviewed by Dave Brosius for CASSANDRA-8231
2014-11-21 14:54:47 -06:00
Jake Luciani 4fd3349e2e Merge branch 'cassandra-2.1' into trunk
Conflicts:
	build.xml
2014-11-05 15:44:03 -05:00
Jake Luciani 4f863be3f7 Fix Cassandra crash when running on JDK8 update 40
Patch by Michael Schuler; reviewed by Robert Stupp (CASSANDRA-8209)
2014-11-05 15:28:24 -05:00
Joshua McKenzie 7dda131a5f Merge branch 'cassandra-2.1' into trunk 2014-10-22 12:13:39 -05:00
Joshua McKenzie 51b27f2078 Fix installing as service on Windows
Patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-8115
2014-10-22 12:09:12 -05:00
Joshua McKenzie 861c4cf2de Integrate Sigar library and add basic OS performance checks on startup
Patch by Amit Kumar and Josh McKenzie; reviewed by tjake for (CASSANDRA-7838)
2014-10-09 12:32:57 -04:00
Jonathan Ellis 3e489dad7d Clean up Windows batch scripts
patch by Josh McKenzie; reviewed by Ala' Alkhaldi for CASSANDRA-7619
2014-07-25 17:23:11 -05:00
Jonathan Ellis 9460503713 improve Windows launch scripts
patch by Ala' Alkhaldi and Josh McKenzie for CASSANDRA-7503
2014-07-14 07:48:03 -05:00
Jonathan Ellis b8ee9da1e8 (Windows) handle spaces in path names
patch by Josh McKenzie; reviewed by Jorge Bay for CASSANDRA-7451
2014-06-27 11:07:47 -05:00
Jonathan Ellis b9153f4ae5 Modify system tcp keepalive settings in Windows install scripts
patch by Josh McKenzie; tested by Philip Thompson for CASSANDRA-7348
2014-06-12 15:05:04 -05:00
Tyler Hobbs 60be74230e Use $CASSANDRA_HOME for default paths instead of /var
Patch by Tyler Hobbs; reviewed by Brandon Williams and Joshua McKenzie
for CASSANDRA-7136
2014-06-05 15:38:41 -05:00
Jonathan Ellis 1927d5ec72 Add PowerShell Windows launch scripts
patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7001
2014-05-14 09:09:51 -07:00
Marcus Eriksson e5ff1075c3 Update to jamm-0.2.6 2014-01-31 15:46:35 +01:00
Brandon Williams 379212d5de Fix logback config in scripts and packaging.
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6530
2014-01-10 09:31:12 -06:00
Sylvain Lebresne 6d3a3eed27 Custom CQL protocol
patch by slebresne; reviewed by yukim and norman for CASSANDRA-2478
2012-07-05 18:21:09 +02:00
Jonathan Ellis 2a1ec27e26 s/goto err/goto :err/ 2012-01-27 09:29:21 -06:00
Jonathan Ellis 33eb53a36d use setlocal in cassandra.bat
patch by Tyler Hobbs; reviewed by Ben Coverston for CASSANDRA-3506

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1203840 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 21:08:03 +00:00
Jonathan Ellis 2372204b50 add bin/daemon to release tarball
patch by bcoverston; reviewed by jbellis for CASSANDRA-3331

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0.0@1180157 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 19:03:06 +00:00
Sylvain Lebresne 3c4f0404ad Remove old jamm jar and update cassandra.bat
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0.0@1171538 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 13:15:38 +00:00
Jonathan Ellis 34e2ae59a9 Add "install" command to cassandra.bat
patch by Ben Coverston; reviewed by jbellis for CASSANDRA-292

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1160429 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 20:55:40 +00:00
Jonathan Ellis 9795e845d2 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1157379 13f79535-47bb-0310-9956-ffa450edef68
2011-08-13 13:53:27 +00:00
Jonathan Ellis f491265fc5 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1137777 13f79535-47bb-0310-9956-ffa450edef68
2011-06-20 20:54:24 +00:00
Eric Evans 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
Eric Evans 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
Jonathan Ellis 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
Jonathan Ellis 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
Eric Evans 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
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