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
e22bc52466
avro 1.3.0 has been release; remove embedded copy
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@917755 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 22:15:20 +00:00
2b69c401cb
merge from 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@917685 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 20:02:34 +00:00
7a451e5226
use ivy for junit and remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911073 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:44:19 +00:00
5778a00d4c
use ivy for json-simple and remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911072 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:44:14 +00:00
da3dc00d7e
use ivy for slf4j and remove local jars
...
Note, slf4j-log4j12 depends on log4j (a slightly older version), so
that jar was removed as well.
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911071 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:44:09 +00:00
1c7697cbde
use ivy for jline and remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911070 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:44:05 +00:00
48a824d493
use ivy for commons-lang and remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911069 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:44:00 +00:00
8529d64fd1
use ivy for commons-collections and remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911068 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:43:56 +00:00
2087f77f39
use ivy for commons-cli; remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911067 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:43:52 +00:00
c19f8f2048
use ivy for google-collect; remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911066 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:43:47 +00:00
26c95ff453
avro and friends (some via ivy)
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904541 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 16:23:49 +00:00
55b617c6a9
applied new thrift jar
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@896206 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 20:32:58 +00:00
cb828319c5
consolidate json libraries
...
Patch by eevans; reviewed by jbellis for CASSANDRA-587
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@894259 13f79535-47bb-0310-9956-ffa450edef68
2009-12-28 22:20:52 +00:00
5f5f0ca2f0
update thrift jar to current recommended revision
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@888687 13f79535-47bb-0310-9956-ffa450edef68
2009-12-09 03:04:26 +00:00
ebbbfc4d70
add new JSON parsing library
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@885323 13f79535-47bb-0310-9956-ffa450edef68
2009-11-30 03:24:53 +00:00
0be4eb0404
clhm licensing/attribution that match current practice
...
Patch by eevans; reviewed by jbellis for CASSANDRA-528
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@833222 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 22:46:42 +00:00
6915e8f60b
add clhm-production.jar
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828752 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 15:37:13 +00:00
26971fb3ff
CLHM, fixed version
...
patch by jbellis; reviewed by goffinet for CASSANDRA-423
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828734 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 14:58:53 +00:00
70d9ef46d1
merge with cassandra-0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@813501 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 16:32:57 +00:00
3e96baefd1
merge with cassandra-0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812698 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 21:21:28 +00:00
ab392a6ee7
remove buggy concurrentlinkedhashmap library and lru cache. too late in 0.4 to try to debug the library -- will revisit for 0.5. patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-405
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810540 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 15:04:16 +00:00
e2af28a6e3
merged from cassandra-0.4 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810282 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 22:25:00 +00:00
59ec4109e4
bump thrift version to 808609 to fix regression from THRIFT-562. patch by jbellis for CASSANDRA-387
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808620 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 20:47:21 +00:00
0f56a25553
update to thrift trunk and rename jar after the svn revision (806014). inline our map typedef to work around regression introduced in THRIFT-144. add slf4j dependencies (required since THRIFT-558). regenerate thrift structs with new version.
...
patch by jbellis for CASSANDRA-308, CASSANDRA-387
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808559 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 18:11:58 +00:00
c4992f48ce
Expose ring map to client for more direct access; patch by junrao; reviewed by jbellis for CASSANDRA-197
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807431 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 23:39:27 +00:00
51401247c1
remove groovy jar, half-baked Callout code. patch by Michael Greene; reviewed by jbellis for CASSANDRA-380
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806267 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 17:24:33 +00:00
1cfd6e4111
add license information for google-collect
...
Patch by eevans; reviewed by jbellis for CASSANDRA-294
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794040 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 20:00:12 +00:00
4b4459c0d1
r/m ZooKeeper vestiges. patch by Michael Greene; reviewed by jbellis for CASSANDRA-291
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793691 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 20:05:04 +00:00
0e9d41aa6f
r/m unused jars from lib/. patch by Ian Eure; reviewed by jbellis for CASSANDRA-290
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793661 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 19:08:32 +00:00
013d59fc00
add concurrentlinkedhashmap cache and config option. config option is NOT yet wired up to control cache sizes.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-259
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791590 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:57:50 +00:00
f116a3e4e5
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779771 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 21:10:07 +00:00
4ac9118f7c
Add get_slice_from functionality using column indexes for efficiency.
...
Patch by Jun Rao and jbellis for CASSANDRA-172
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@777578 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 15:33:42 +00:00
d03d80b6ed
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@776716 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 14:44:41 +00:00
88edbed30c
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775983 13f79535-47bb-0310-9956-ffa450edef68
2009-05-18 15:22:23 +00:00
9307f621bc
we don't need these jars for junit
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773957 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 16:11:37 +00:00
97fc5cb8ef
migrate to JUnit 4.6. patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-162
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773940 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 15:26:38 +00:00
6d075b51b9
junit xml output for hudson's benefit. patch by johano; reviewed by jbellis for #32
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@768579 13f79535-47bb-0310-9956-ffa450edef68
2009-04-25 18:46:48 +00:00
ef293c1a6a
return empty lists instead of raising an error where applicable; otherwise, use
...
NotFoundError instead of CassandraException. rely on THRIFT-378 to report internal errors.
also, add field numbers to work around thrift bug generating python code.
patch by jbellis; reviewed by Jun Rao for #66
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@768382 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 17:52:25 +00:00
4ed201b99f
r/m libfb303 as a dependency. (this completes the process begun by Prashant earlier.) patch by Jun Rao; reviewed by jbellis for #86
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765703 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 17:47:25 +00:00
5e72feef0e
upgrade to thrift svn r763981. for Java, this should be identical to thrift 0.1. patch by jbellis; reviewed by Eric Evans for #72
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765262 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 16:28:03 +00:00
b61cbd37e8
add antlr-3.1.3 (should have been in r761805
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761820 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 22:18:39 +00:00
b9bc065e3d
upgrade to latest antlr; expunge 2.x. patch by Per Mellqvist, reviewed by jbellis. see #46
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761805 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 21:27:40 +00:00
9017f33e7f
upgrade NBHM to latest version (1.1.1) from sf.net
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761714 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 15:57:58 +00:00
8632f05518
r/m generated files from svn and modify build.xml to build them. added back required jars for generation (antlr 2.7.7 and stringtemplate). patch by Per Mellqvist for #40
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761384 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 19:17:04 +00:00
ce8f72e4af
remove unused libraries; update log4j to 1.2.15; add commons-collections
...
and commons-lang; wildcard lib/ in build.xml
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758963 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:18:04 +00:00
1f91e99223
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@749218 13f79535-47bb-0310-9956-ffa450edef68
2009-03-02 07:57:22 +00:00
Eric Evans