Commit Graph

151 Commits

Author SHA1 Message Date
Brandon Williams 4993d427b1 Update pig readme for m3p 2013-01-04 07:44:22 -06:00
Sylvain Lebresne 3a005df397 Replace supercolumns internally by composites
patch by slebresne; reviewed by Vijay for CASSANDRA-3237
2013-01-02 13:40:13 +01:00
Aleksey Yeschenko 2eaea5a2a4 Merge branch 'cassandra-1.2' into trunk 2012-12-17 18:41:41 +03:00
Aleksey Yeschenko 706612e300 Fix SimpleAuthorizer example;
patch by Aleksey Yeschenko, reviewed by Jonathan Ellis for
CASSANDRA-5072
2012-12-17 18:35:31 +03:00
Aleksey Yeschenko 253a7f028b Merge branch 'cassandra-1.2' into trunk
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
2012-12-08 18:39:52 +03:00
Aleksey Yeschenko bddfa9e120 Update IAuthenticator to match the new IAuthorizer;
patch by Aleksey Yeschenko, reviewed by Jonathan Ellis for CASSANDRA-5003
2012-12-08 18:21:14 +03:00
Jonathan Ellis 6a5c9ed879 make index_interval configurable per columnfamily
patch by Radim Kolar; reviewed by jbellis for CASSANDRA-3961
2012-12-01 10:03:52 +09:00
Aleksey Yeschenko 5a3eb1a6c3 Replace IAuthority with new IAuthorizer; patch by Aleksey Yeschenko,
reviewed by Jonathan Ellis for CASSANDRA-4874
2012-11-27 20:30:24 +03:00
Brandon Williams f31c53049d Switch word count to M3P. Patch by brandonwilliams reviewed by yukim
for CASSANDRA-4975
2012-11-26 16:59:54 -06:00
Jonathan Ellis 6ca75ef9ba remove vestiges of Thrift unframed mode
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4729
2012-09-27 15:25:07 -05:00
Brandon Williams d634f05161 Merge branch 'cassandra-1.1' into trunk 2012-09-21 15:15:17 -05:00
Brandon Williams 686fe1e145 Pass pig vars through url params in addition to env vars.
Patch by Jeremiah Johnson and brandonwilliams, reviewed by xedin for
CASSANDRA-4499
2012-09-21 14:58:36 -05:00
Sylvain Lebresne 3a2faf9424 Finer grained exception hierarchy, and adds error codes
patch by slebresne; reviewed by thepaul for CASSANDRA-3979
2012-09-05 17:50:59 +02:00
Jonathan Ellis 7d857e68a4 clean up "if" style 2012-07-28 09:45:16 -05:00
Brandon Williams 6f384c54de Pig: support for Int32Type.
Patch by brandonwilliams, reviewed by xedin for CASSANDRA-4459
2012-07-25 12:06:49 -05:00
Brandon Williams 7f6cc5ef6c Pig: support for composite row keys, writing composites
Patch by Dirkjan Bussink, reviewed by brandonwilliams for CASSANDRA-4144
2012-07-13 10:38:15 -05:00
Sylvain Lebresne 3816ab87cc Add missing licences and versions for 1.1.1 release 2012-06-01 18:20:02 +02:00
Brandon Williams d484e28d19 Minor correction in pig readme/example.
Patch by Fabian Rousseau, reviewed by brandonwilliams for CASSANDRA-4301
2012-05-31 09:48:58 -05:00
Brandon Williams 2dc27a1756 Update pig readme 2012-05-26 10:50:00 -05:00
Brandon Williams 0529feb791 Merge from 1.0 2012-05-01 12:05:59 -05:00
Jonathan Ellis 7321adf432 add log4j properties 2012-04-11 13:24:32 -05:00
Sylvain Lebresne d69d304c4e Remove dead sliced_buffer_size_in_kb option
patch by slebresne; reviewed by jbellis for CASSANDRA-4076
2012-03-30 16:44:24 +02:00
Jonathan Ellis c29037290a Merge branch 'cassandra-1.0' into cassandra-1.1.0 2012-03-13 23:24:29 -05:00
Jonathan Ellis f42ec6d599 add environment variables to the simpleauth README 2012-03-13 23:21:52 -05:00
Brandon Williams 470873fcb5 Merge from 1.0 2012-02-29 14:41:29 -06:00
Brandon Williams f9454d00b4 Merge branch 'cassandra-1.0' into cassandra-1.1.0 2012-02-28 09:49:03 -06:00
Brandon Williams 85934a1e27 Merge branch 'cassandra-1.0' into cassandra-1.1.0 2012-02-27 10:54:55 -06:00
Brandon Williams 3a4459f0a6 Merge from 1.0 2012-02-14 14:19:47 -06:00
Brandon Williams 1d435db703 Merge from 1.0 2012-02-13 17:34:34 -06:00
Brandon Williams 3c35bf4fe3 Make pig script executable 2012-02-01 12:14:47 -06:00
T Jake Luciani fba541c0c3 Add wide row support to ColumnFamilyInputFormat
Patch by jbellis; reviewed by tjake for CASSANDRA-3264
2012-01-25 15:43:55 -05:00
Brandon Williams dc7db04517 Move pig to src and examples.
Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-3713.
2012-01-24 07:37:00 -06:00
Jonathan Ellis 27b818386c update configuration checking post-#3197
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-3765
2012-01-23 16:03:48 -06:00
Jonathan Ellis ee5dbdb8d3 add test of KeyRange.filter
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2878
2012-01-23 16:02:52 -06:00
Jonathan Ellis e31879e595 reformat 2012-01-23 16:02:44 -06:00
Jonathan Ellis 5409af4535 switch to int for count output 2012-01-23 16:02:28 -06:00
Jonathan Ellis 05786528de fix word_count build 2012-01-20 17:12:21 -06:00
Brandon Williams de333791e8 Fix flawed addToMutationMap in word count example.
Patch by Dave Brosius, reviewed by Brandon Williams for CASSANDRA-3669
2012-01-04 10:33:57 -06:00
Eric Evans 2ede7fc4be move FBUtils methods for bytes<->hex to separate class
Patch by eevans; reviewed by jbellis for CASSANDRA-3299

Conflicts:

	drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
	drivers/java/test/org/apache/cassandra/cql/jdbc/PreparedStatementTest.java

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1181025 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 15:38:37 +00:00
Sylvain Lebresne 0d9fdad0b5 Move SimpleAuthenticator and SimpleAuthority to examples/
patch by slebresne; reviewed by jbellis for CASSANDRA-2922


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0.0@1180076 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 15:29:22 +00:00
Jonathan Ellis 2816bd471f merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1153198 13f79535-47bb-0310-9956-ffa450edef68
2011-08-02 17:04:15 +00:00
Jonathan Ellis b803c37852 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1147869 13f79535-47bb-0310-9956-ffa450edef68
2011-07-18 13:32:48 +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
Jonathan Ellis a3e2926485 r/m binarymemtable
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2692

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135249 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 19:46:18 +00:00
Jonathan Ellis 56997214b6 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135244 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 19:40:21 +00:00
Jonathan Ellis 00fd00db5d merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1134431 13f79535-47bb-0310-9956-ffa450edef68
2011-06-10 20:19:23 +00:00
Jonathan Ellis a2665b174c revert incomplete BMT-excision
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1127179 13f79535-47bb-0310-9956-ffa450edef68
2011-05-24 17:43:32 +00:00
Jonathan Ellis 4f9b1604c7 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1127165 13f79535-47bb-0310-9956-ffa450edef68
2011-05-24 17:34:36 +00:00
T Jake Luciani be67fda27e merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1126664 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23 19:03:33 +00:00
Jonathan Ellis 2d95cb4957 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095492 13f79535-47bb-0310-9956-ffa450edef68
2011-04-20 19:50:50 +00:00
Jonathan Ellis 944ed31f60 move example code from contrib/ to examples/, and tools from contrib/ to tools/
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1087744 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01 15:19:27 +00:00