natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,495 Commits 17 Branches 338 Tags 650 MiB
Commit Graph

132 Commits

Author SHA1 Message Date
Jonathan Ellis efb08ad308 merge from 2.1 2015-06-08 09:34:52 -05:00
Jonathan Ellis 46ce21c7b7 merge from 2.0 2015-06-08 09:34:16 -05:00
Stefania Alborghetti a8ceb2c650 Added quotes to CLASSPATH and JAVA for nix scripts, CASSANDRA-9529 2015-06-08 09:29:10 -05:00
Sam Tunnicliffe 1936657570 Remove use of Cell in Thrift M/R classes 
Patch and review by Philip Thompson and Sam Tunnicliffe for
CASSANDRA-8609
 2015-06-04 10:46:57 +01:00
Brandon Williams 8a4abdda1e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
 2015-01-13 11:28:07 -06:00
Brandon Williams 359d3bb2a6 Pig: Refactor and deprecate CqlStorage 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-8599
 2015-01-13 11:24:45 -06:00
Brandon Williams 0757dc72f2 fix errant CPIF references 2015-01-12 11:57:53 -06:00
Brandon Williams 3b945483bd Merge branch 'cassandra-2.1' into trunk 2015-01-12 11:57:36 -06:00
Brandon Williams f6d0f436b3 fix errant CPIF references 2015-01-12 11:57:23 -06:00
Aleksey Yeschenko e1e28d0f0d Merge branch 'cassandra-2.1' into trunk 2015-01-07 02:26:43 +03:00
Aleksey Yeschenko edf48f8173 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-01-07 02:25:59 +03:00
Aleksey Yeschenko e27cdf935c Revert "fix references to defunct CqlPagingInputFormat" 
This reverts commit e550ea6021.
 2015-01-07 02:25:09 +03:00
Dave Brosius cfee3da908 simplify: 2014-12-27 21:09:26 -05:00
Dave Brosius 36b287bea4 Merge branch 'cassandra-2.1' into trunk 2014-12-27 20:40:16 -05:00
Dave Brosius 6124a733cb Merge branch 'cassandra-2.0' into cassandra-2.1 2014-12-27 20:32:20 -05:00
rekhajoshm e550ea6021 fix references to defunct CqlPagingInputFormat 
patch by rjoshi reviewed by dbrosius for CASSANDRA-8541
 2014-12-27 20:23:01 -05:00
Brandon Williams 6801cb0415 Remove fat client mode 
Patch by brandonwilliams, reviewed by Joshua McKenzie for CASSANDRA-7820
 2014-10-14 10:36:04 -05:00
Aleksey Yeschenko 380273826d Remove cassandra-cli 
patch by Aleksey Yeschenko; reviewed by Brandon Williams and Jason Brown
for CASSANDRA-7920
 2014-09-24 18:33:29 -07:00
Brandon Williams 3d9db291af Merge branch 'cassandra-2.1' into trunk 2014-07-18 12:36:31 -05:00
Brandon Williams 8fd8832a87 Fix word count 
Patch by  Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-7200
 2014-07-18 12:35:57 -05:00
Brandon Williams 337e4a8292 Fix word count 
Patch by  Ala' Alkhaldi, reviewed by brandonwilliams for CASSANDRA-7200
 2014-07-18 12:31:17 -05:00
Jonathan Ellis 83ac8a631e merge from 2.0 2014-07-11 23:50:46 -05:00
Brandon Williams 2d69ad2165 Merge branch 'cassandra-2.1' into trunk 2014-07-11 14:21:18 -05:00
Brandon Williams 1b1e2b9c06 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-07-11 14:21:08 -05:00
Brandon Williams 58931dd6fe Make cql3 word count executable 2014-07-11 14:20:57 -05:00
Aleksey Yeschenko f20b097821 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	doc/cql/CQL.textile
	src/java/org/apache/cassandra/cql/CFPropDefs.java
 2014-07-03 21:41:28 +03:00
Aleksey Yeschenko 92cb551ae3 Remove left-over populate_io_cache_on_flush and replicate_on_write uses 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for CASSANDRA-7493
 2014-07-03 21:35:39 +03:00
Dave Brosius 93c99a65e7 switch external naming of 'column families' to 'tables' 
patch by dbrosius reviewed by jbellis for cassandra-7369
 2014-06-18 23:30:02 -04:00
Dave Brosius a1f9b7c71e add the sample properties file to the example trigger jar so it can be loaded 2014-05-15 23:07:35 -04:00
Dave Brosius 401ed436ab fix typo 2014-05-15 22:32:41 -04:00
Dave Brosius 3ce2ce7144 minor cleanups in trigger sample 2014-05-15 22:23:02 -04:00
Aleksey Yeschenko c6bed82702 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
 2014-05-13 17:51:34 +03:00
Anthony Cozzie 820f0eb60b Fix the InvertedIndex trigger example 
patch by Anthony Cozzie; reviewed by Aleksey Yeschenko for CASSANDRA-7211
 2014-05-13 17:46:21 +03:00
Sylvain Lebresne 7b32dbd4db Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
 2014-03-26 15:38:13 +01:00
Sylvain Lebresne d7cb970053 Add CqlRecordReader to take advantage of native CQL pagination 
patch by alexliu68; reviewed by pkolaczk for CASSANDRA-6311
 2014-03-26 15:34:59 +01:00
Sylvain Lebresne 6df3163752 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-03-25 16:52:21 +01:00
Sylvain Lebresne b0841d8fee Revert "Add CqlRecordReader to take advantage of native CQL pagination" 
This reverts commit 3b708f9989.

Conflicts:

	CHANGES.txt
 2014-03-25 16:49:10 +01:00
Sylvain Lebresne a7c4659dbd Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-03-21 15:31:25 +01:00
Sylvain Lebresne 3b708f9989 Add CqlRecordReader to take advantage of native CQL pagination 
patch by alexliu68; reviewed by pkolaczk for CASSANDRA-6311
 2014-03-21 15:26:41 +01:00
Jonathan Ellis 815892e8c1 merge from 2.0 2014-03-17 16:35:07 -05:00
Jonathan Ellis b4f2ff17ad Update hadoop_cql3_word_count example 
patch by Chandar Pechetty; reviewed by Alex Liu for CASSANDRA-6703
 2014-03-17 16:34:23 -05:00
Aleksey Yeschenko 6bbb13b9b0 Rename RowMutation->Mutation in preparation for Row->Partition 2013-12-22 00:37:43 +03:00
Sylvain Lebresne e50d6af12f Rename Column to Cell 2013-12-17 17:52:20 +01:00
Aleksey Yeschenko 9ebb091829 Fix the trigger example 2013-11-24 08:32:32 +03:00
Brandon Williams cb7eb8687d Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	build.xml
	debian/changelog
 2013-11-20 11:54:57 -06:00
Brandon Williams 5f79f5321b update pig example scripts 
Patch by Jeremy Hanna, reviewed by brandonwilliams for CASSANDRA-6239
 2013-11-20 10:19:17 -06:00
Sylvain Lebresne b6147c1c7b License and versions for 2.0.2 release 2013-10-22 18:01:51 +02:00
Brandon Williams 3a29c74807 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-14 13:34:13 -05:00
Brandon Williams 17ae0429ca Update the pig examples to include more recent pig/cassandra features. 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-4549
 2013-10-14 13:32:58 -05:00
Aleksey Yeschenko 326d5454dd Track clients' remote addresses in ClientState 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6070
 2013-09-24 17:00:17 +03:00