Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dda131a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dda131a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dda131a Branch: refs/heads/trunk Commit: 7dda131a5f109799ead6c5766fb7fad56138ba76 Parents: f6c9d28 51b27f2 Author: Joshua McKenzie <[email protected]> Authored: Wed Oct 22 12:13:39 2014 -0500 Committer: Joshua McKenzie <[email protected]> Committed: Wed Oct 22 12:13:39 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra.bat | 51 ++++++++++++++-------- bin/cassandra.ps1 | 103 +++++++++++++++++++++++++++----------------- conf/cassandra-env.ps1 | 5 +++ 4 files changed, 103 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dda131a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4ed5860,24e0d36..0dae098 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,5 +1,36 @@@ +3.0 + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.2 + * Fix installing as service on Windows (CASSANDRA-8115) * Fix CREATE TABLE for CQL2 (CASSANDRA-8144) * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dda131a/bin/cassandra.bat ---------------------------------------------------------------------- diff --cc bin/cassandra.bat index cba69c6,31a0235..7a41e90 --- a/bin/cassandra.bat +++ b/bin/cassandra.bat @@@ -67,11 -68,9 +68,10 @@@ set JAVA_OPTS=-ea -Dcom.sun.management.jmxremote.port=7199^ -Dcom.sun.management.jmxremote.ssl=false^ -Dcom.sun.management.jmxremote.authenticate=false^ - -Dlogback.configurationFile=logback.xml + -Dlogback.configurationFile=logback.xml^ + -Djava.library.path=%CASSANDRA_HOME%\lib\sigar-bin REM ***** CLASSPATH library setting ***** - REM Ensure that any user defined CLASSPATH variables are not used on startup set CLASSPATH="%CASSANDRA_HOME%\conf" http://git-wip-us.apache.org/repos/asf/cassandra/blob/7dda131a/conf/cassandra-env.ps1 ----------------------------------------------------------------------
