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

811 Commits

Author SHA1 Message Date
Dave Brosius 2279d49e96 Allow cassandra to compile under java 8 
patch by dbrosius reviewed by jmckenzie for cassandra-7028
 2014-10-02 12:47:08 -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
Jason Brown 916efcb6fb Merge branch 'cassandra-2.1' into trunk 2014-09-05 16:48:17 -07:00
Jason Brown 8d69214197 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	build.xml
 2014-09-05 16:45:20 -07:00
Pavel Yaskevich e6f307f4e5 bump thrift-server version to 0.3.7 to properly shutdown invocation pool shutdown 
patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594
 2014-09-05 14:23:24 -07:00
Robert Stupp 511129ddbd Accept Java source code for user-defined functions 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7562
 2014-09-03 14:37:15 -05:00
Jason Brown 936dea8952 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2014-09-03 10:48:50 -07:00
Jason Brown cae8715750 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	build.xml
	lib/thrift-server-0.3.5.jar
	lib/thrift-server-0.3.6.jar
 2014-09-03 10:45:52 -07:00
Pavel Yaskevich b22089d7c8 Make disruptor_thrift_server invocation pool configurable 
patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594
 2014-09-02 16:14:27 -07:00
Sylvain Lebresne bc63083217 Merge branch 'cassandra-2.1' into trunk 2014-08-22 16:17:01 +02:00
Sylvain Lebresne 94f1107eca Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
 2014-08-22 16:16:46 +02:00
Sylvain Lebresne 8da134377a Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
 2014-08-22 16:15:50 +02:00
Sylvain Lebresne 200b802884 Update java driver to 2.0.5 (for hadoop) 2014-08-22 16:11:44 +02:00
Sylvain Lebresne 9aea917b2c Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	CHANGES.txt
 2014-08-18 10:23:20 +02:00
Sylvain Lebresne 5db108c314 Support list index operation with conditions 
patch by slebresne; reviewed by thobbs for CASSANDRA-7499
 2014-08-18 10:22:40 +02:00
Joshua McKenzie 048f72bd3e Merge branch 'cassandra-2.1' into trunk 2014-08-13 17:12:24 -05:00
Joshua McKenzie 74e7f28f7f fix generate-eclipse-files build.xml target on JDK 8 
Patch by Robert Stupp, reviewed by Josh McKenzie for CASSANDRA-7430
 2014-08-13 17:10:23 -05:00
Joshua McKenzie 696acc9239 Merge branch 'cassandra-2.1' into trunk 2014-08-12 16:40:38 -05:00
Joshua McKenzie 54215a21f0 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-12 16:40:15 -05:00
Joshua McKenzie dc8b4e1118 build.xml - exclude *.ps1 from fixcrlf 
Patch by Robert Stupp; review by Joshua McKenzie for CASSANDRA-7690
 2014-08-12 16:37:20 -05:00
Aleksey Yeschenko 5205ce669f Merge branch 'cassandra-2.1' into trunk 2014-08-11 01:08:53 +03:00
Aleksey Yeschenko f2f2d47324 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java
 2014-08-11 01:07:32 +03:00
Sylvain Lebresne 74847893c8 Versions for 2.1.0-rc6 2014-08-09 13:47:44 +02:00
Robert Stupp 25411bf1d1 Support pure user-defined functions 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7395
 2014-08-08 14:11:01 -05:00
Sylvain Lebresne 2f25e6e6ea Merge branch 'cassandra-2.1' into trunk 2014-08-08 12:51:12 +02:00
Sylvain Lebresne 8aed4196d2 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-08 12:50:44 +02:00
Sylvain Lebresne a932b62eae Include stress yaml examples in release and deb 
patch by tjake and mshuler; reviewed by mshuler and slebresne for CASSANDRA-7717
 2014-08-08 12:49:25 +02:00
Sylvain Lebresne cd37d07baf Version and licenses for 2.0.10 release 2014-08-08 10:54:41 +02:00
Aleksey Yeschenko 59123b6f7d Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
 2014-08-07 00:51:07 +03:00
Aleksey Yeschenko 6beb13f19c Synchronise build.xml developers list with ASF C* committers 
See https://people.apache.org/committers-by-project.html#cassandra and
https://wiki.apache.org/cassandra/Committers
 2014-08-07 00:48:23 +03:00
Benedict Elliott Smith efe57f2306 Merge branch 'cassandra-2.1' into trunk 2014-08-05 15:22:21 +01:00
Benedict Elliott Smith 6a8d978f39 ninja add benedict to committers 2014-08-05 15:22:11 +01:00
Sylvain Lebresne cc3bd8bc98 Merge branch 'cassandra-2.1' into trunk 2014-08-05 10:22:32 +02:00
Sylvain Lebresne e6602f7639 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-05 10:22:07 +02:00
Sylvain Lebresne 95d289b849 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	build.xml
 2014-08-05 10:21:48 +02:00
Sylvain Lebresne 5151fd5bcc Update java driver to 2.0.4 (for hadoop) 
patch by alexliu68; reviewed by slebresne for CASSANDRA-7618
 2014-08-05 10:18:58 +02:00
Dave Brosius d6f3cdf6ff Merge branch 'cassandra-2.1' into trunk 2014-08-03 00:45:48 -04:00
Dave Brosius 8d06dd102d Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-03 00:39:59 -04:00
Sylvain Lebresne cfb335e39b Update versions for 2.1.0-rc5 release 2014-08-02 13:48:00 +02:00
Brandon Williams 1e2a5b0ee3 Pig support for hadoop CqlInputFormat 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6454
 2014-07-23 10:26:50 -05:00
Brandon Williams 2093270c7c Merge branch 'cassandra-2.1' into trunk 2014-07-21 07:51:21 -05:00
Brandon Williams 3b14f6a5db Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-07-21 07:51:10 -05:00
Eric Evans d872e2c746 update versioning for 2.1.0-rc4 release 2014-07-18 13:42:11 -05:00
Jonathan Ellis 5dfee585dd fix build on os x 2014-07-17 15:57:30 -05:00
Brandon Williams 15ced94287 Merge branch 'cassandra-2.1' into trunk 2014-07-09 11:58:27 -05:00
Brandon Williams 40fd7f0120 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-09 11:58:15 -05:00
Brandon Williams 0b8fb5bb92 fix missing test build dep for pig-test 2014-07-09 11:50:49 -05:00
Aleksey Yeschenko 111f0c0f91 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	debian/changelog
 2014-07-08 20:21:26 +03:00
Aleksey Yeschenko 04944f0ca9 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-08 20:18:24 +03:00
Sylvain Lebresne 0bc98414ce Update versions and licenses for 2.1 RC3 release 2014-07-08 14:07:17 +02:00
Sylvain Lebresne 5b7798cd5e Merge branch 'cassandra-2.1' into trunk 2014-07-01 15:41:26 +02:00
Sylvain Lebresne 277475837f Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-07-01 15:40:20 +02:00
Sylvain Lebresne fcd3cc0eb6 Make sure cql-test only run CQLTester ones 2014-07-01 15:38:51 +02:00
Benedict Elliott Smith 51cdeed483 Merge branch 'cassandra-2.1' into trunk 2014-06-30 14:31:52 +01:00
Benedict Elliott Smith e77ea12520 Optimise CellName/Composite comparisons for NativeCell 
patch by Jake Luciani and Benedict Elliott Smith for CASSANDRA-6755
 2014-06-30 14:30:55 +01:00
Jonathan Ellis c027183ea4 fix build on os x 2014-06-27 16:35:28 -05:00
Sylvain Lebresne 79f3874d81 Versions update for 2.0.9 release 2014-06-26 10:34:53 +02:00
Jake Luciani 8322ec27ca Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	build.xml
	test/unit/org/apache/cassandra/cli/CliTest.java
 2014-06-25 17:46:07 -04:00
Jake Luciani 23893ead55 Paralellize the unit tests 
patch by tjake; reviewed by thobbs for CASSANDRA-7442
 2014-06-25 17:09:31 -04:00
Brandon Williams eb396399ce Exclude stress/thrift from jacoco 
Patch by Russ Hatch, reviewed by brandonwilliams for CASSANDRA-7226
 2014-06-25 13:43:38 -05:00
Brandon Williams 33c5e19a26 Rename code coverage test. 
Patch by Russ Hatch, reviewed by brandonwilliams for CASSANDRA-7226
 2014-06-24 11:14:05 -05:00
Sylvain Lebresne e2bef02e25 Update versions for 2.1.0-rc2 release 2014-06-23 19:00:07 +02:00
Brandon Williams e77b70eecc Allow browsing in jacoco-report 
Patch by Russ Hatch, reviewed by brandonwilliams for CASSANDRA-7226
 2014-06-20 11:37:22 -05:00
Russ Hatch 46c3896c62 enable code coverage using JaCoCo 
patch by rhatch reviewed by dbrosius for cassandra-7226
 2014-06-18 22:32:11 -04:00
Jake Luciani 805a4aeebe Merge branch 'cassandra-2.1' into trunk 2014-06-17 15:09:31 -04:00
Jake Luciani a3dc7b8b41 Upgrade netty to 4.0.20 2014-06-17 15:09:03 -04:00
Jake Luciani 8a91a1a59e Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/transport/CBUtil.java
 2014-06-05 14:22:19 -04:00
Jake Luciani 4722fe70aa RefCount native frames from netty to avoid corruption bugs 
patch by tjake; reviewed by bes for CASSANDRA-7245
 2014-06-05 14:15:32 -04:00
Sylvain Lebresne 99ba549d0d Merge branch 'cassandra-2.1' into trunk 2014-06-05 08:40:27 +02:00
Sylvain Lebresne 78e91c4cac Reduce run time for CQL tests 
patch by slebresne; reviewed by thobbs for CASSANDRA-7327
 2014-06-05 08:39:48 +02:00
Brandon Williams ce248f227b Merge branch 'cassandra-2.1' into trunk 2014-05-30 17:52:32 -05:00
Brandon Williams e56a64edb0 Upgrade to Pig 0.12.1 
Patch by brandonwilliams for CASSANDRA-6556
 2014-05-30 17:52:08 -05:00
Mikhail Stepura e91bf8f3ea Merge branch 'cassandra-2.1' into trunk 2014-05-30 11:00:14 -07:00
Sylvain Lebresne c108ce5bf2 Licenses and versions in preparation of 2.1rc1 release 2014-05-30 17:27:53 +02:00
Sylvain Lebresne 56c2f0ab11 Merge branch 'cassandra-2.1' into trunk 2014-05-29 11:36:28 +02:00
Sylvain Lebresne 0932ed670c Tuple types 
patch by slebresne; reviewed by thobbs for CASSANDRA-7248
 2014-05-29 11:33:11 +02:00
Dave Brosius 079de5ba91 Merge branch 'cassandra-2.1' into trunk 2014-05-28 06:46:11 -04:00
Dave Brosius 6d1500c501 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-28 06:45:39 -04:00
Oded Peer 0c96f99e48 add src/resources to the generate eclipse .project file's src paths 
patch by opeer reviewed by dbrosius for cassandra-5964
 2014-05-28 06:44:04 -04:00
Jonathan Ellis 4a6525655c Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-28 11:51:55 +02:00
Jonathan Ellis 5d40dffabe xmx 2014-05-28 11:51:41 +02:00
Mikhail Stepura c2cfefc507 Merge branch 'cassandra-2.1' into trunk 2014-05-19 14:34:04 -07:00
Mikhail Stepura 0f706c528e Ninja: thrift-server-0.3.5.jar for CASSANDRA-6285 2014-05-19 14:33:19 -07:00
Brandon Williams 61084fb53b Merge branch 'cassandra-2.1' into trunk 2014-05-19 13:59:20 -05:00
Brandon Williams 606bc51e0d Switch disruptor to 0.3.5 2014-05-19 13:58:57 -05:00
Brandon Williams 1cfa56100c Merge branch 'cassandra-2.1' into trunk 2014-05-14 13:27:49 -05:00
Brandon Williams a680f721b0 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-14 13:27:34 -05:00
Brandon Williams 2092da0974 Exclude xerces to fix hadoop build issue. 
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6877
 2014-05-14 13:26:18 -05:00
Jake Luciani 4b8f667d04 Merge branch 'cassandra-2.1' into trunk 2014-05-14 09:06:34 -04:00
Jake Luciani 4ee372106f Followup commit to fix maven deps on boundary's NBHM for CASSANDRA-7128 2014-05-14 09:02:45 -04:00
Sylvain Lebresne d24513e046 Remove duplicate compiler flag 2014-05-13 14:07:00 +02:00
Sylvain Lebresne 3b949c2d1c Merge branch 'cassandra-2.1' into trunk 2014-05-13 14:06:25 +02:00
Sylvain Lebresne 09feef30bc Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-13 14:06:10 +02:00
Sylvain Lebresne 256109c34f Quiet the unsafe use warning during build 2014-05-13 14:05:54 +02:00
Brandon Williams 9224dd5cf3 Merge branch 'cassandra-2.1' into trunk 2014-05-06 13:48:14 -05:00
Brandon Williams ef92bb5f33 disable boundary repo temporarily 2014-05-06 13:48:06 -05:00
Sylvain Lebresne 006853300f Versions and NEWS update for 2.0.8 release 2014-05-06 10:29:53 +02:00
Dave Brosius 754643c5e4 Merge branch 'cassandra-2.1' into trunk 2014-05-06 01:37:15 -04:00
Dave Brosius aa3c10dd0c fix group id (com.boundary) for high-scale-lib 2014-05-06 01:36:53 -04:00
T Jake Luciani 5c66dc819b Merge branch 'cassandra-2.1' into trunk 2014-05-05 17:13:08 -04:00
T Jake Luciani f0575f153b high-scale-lib upgrade 
Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128
 2014-05-05 16:37:22 -04:00
Jonathan Ellis b8c0199c33 Merge branch 'cassandra-2.1' into trunk 2014-05-02 22:49:44 -05:00
Jonathan Ellis 8e897de687 merge from 2.1 2014-05-02 22:49:31 -05:00
Jonathan Ellis fab45571b8 give some antlr targets more heap space 2014-05-02 22:41:14 -05:00
Dave Brosius 5c2f89a0e9 Merge branch 'cassandra-2.1' into trunk 2014-05-02 23:08:30 -04:00
Dave Brosius 6708d05ec5 netty >= version 4.0 now has an artifact name of netty-all 2014-05-02 23:07:34 -04:00
Dave Brosius b6974fb94b Merge branch 'cassandra-2.1' into trunk 2014-05-02 22:54:26 -04:00
Dave Brosius df62c62617 fix logback version string typo: 1.1.12 s/b 1.1.2 2014-05-02 22:52:11 -04:00
Dave Brosius e460e6c6b4 Merge branch 'cassandra-2.1' into trunk 2014-05-02 20:44:54 -04:00
Dave Brosius 93fef85056 switch to using jamm with groupId com.github.jbellis, as this one is published for 0.2.6 2014-05-02 20:44:25 -04:00
Sylvain Lebresne d8490ccea1 Merge branch 'cassandra-2.1' into trunk 2014-05-01 18:00:31 +02:00
Sylvain Lebresne 48727b4ccb Update versions and add licenses for 2.1-beta2 release 2014-05-01 16:40:15 +02:00
Sylvain Lebresne 6b4d980357 Merge branch 'cassandra-2.1' into trunk 2014-04-30 20:22:53 +02:00
Sylvain Lebresne 9872b74ef2 Native protocol v3 
patch by slebresne; reviewed by thobbs for CASSANDRA-6855
 2014-04-30 20:21:35 +02:00
Dave Brosius afe2e14079 quell all the 'internal proprietary API' warnings induced by Unsafe and friends 2014-04-28 23:14:05 -04:00
Dave Brosius 4d0691759a Allow cassandra to compile under java 8 
patch by dbrosius reviewed by jmckenzie for cassandra-7028
 2014-04-15 20:38:32 -04:00
Sylvain Lebresne 7dbbe9233c Update versions for 2.0.7 release 2014-04-14 16:43:46 +02:00
Tyler Hobbs 9e2eca3daa Merge branch 'cassandra-2.1' into trunk 2014-04-08 12:26:38 -05:00
Tyler Hobbs 0fa5cba35b Merge branch 'cassandra-2.0' into cassandra-2.1 2014-04-08 12:26:09 -05:00
Tyler Hobbs 84daab53ea Avoid build failure due to ANTLR timeout 
Patch by Ben Chan; reviewed by Tyler Hobbs for CASSANDRA-6991
 2014-04-08 12:25:21 -05:00
Dave Brosius 6471d0caa4 Merge branch 'cassandra-2.1' into trunk 2014-04-02 20:55:46 -04:00
Dave Brosius f3d8ecf84c update logback to version 1.1.2 2014-04-02 20:53:58 -04:00
Dave Brosius eeef4061b7 Merge branch 'cassandra-2.1' into trunk 2014-03-28 21:14:04 -04:00
Dave Brosius 6844462898 snaptree is no longer a dependency in 2.1 and forwards 2014-03-28 21:13:21 -04:00
Sylvain Lebresne 3d399259d8 Merge branch 'cassandra-2.1' into trunk 2014-03-26 15:38:31 +01: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 48bf2b1317 Merge branch 'cassandra-2.1' into trunk 2014-03-25 16:53:38 +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 66b304e8c7 Merge branch 'cassandra-2.1' into trunk 2014-03-21 15:31:41 +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 c3d9280e45 Merge branch 'cassandra-2.1' into trunk 2014-03-17 11:37:16 -05:00
Jonathan Ellis dd60ab4740 fix CRLF in bash scripts when building on Windows 
patch by Peter; reviewed by Joshua McKenzie for CASSANDRA-6798
 2014-03-17 11:37:10 -05:00
Mikhail Stepura 510ffca9c9 Merge branch 'cassandra-2.1' into trunk 2014-03-14 13:51:42 -07:00
Mikhail Stepura 22b271689b Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-14 13:51:29 -07:00
Mikhail Stepura 245038fd25 Fix "codecoverage" task 2014-03-14 13:49:49 -07:00
Dave Brosius 8955a4658e Merge branch 'cassandra-2.1' into trunk 2014-03-14 00:47:29 -04:00
Dave Brosius 729da03c53 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-14 00:46:32 -04:00
Dave Brosius c49d33633a fix duplicate classes between cassandra-all and cassandra-thrift 
patch by dbrosius reviewed by jbellis for CASSANDRA-5833
 2014-03-14 00:43:10 -04:00
Sylvain Lebresne 656edc529d Update version, news and license for 2.0.6 2014-03-07 13:20:03 +01:00
Tyler Hobbs 9371892374 Merge branch 'cassandra-2.1' into trunk 2014-03-06 11:55:59 -06:00
Jonathan Ellis 728f677b0f Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-06 09:40:56 -06:00
Jonathan Ellis c2ec94b354 update cobertura version 
patch by Ed Capriolo for CASSANDRA-6800
 2014-03-06 09:40:46 -06:00
Brandon Williams 7c7193769c Merge branch 'cassandra-2.1' into trunk 2014-03-05 12:55:30 -06:00
Brandon Williams 4cf8a8a6c3 Add hadoop progressable compatibility. 
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-5201
 2014-03-05 12:54:42 -06:00
Brandon Williams 249230834c Add hadoop progressable compatibility. 
Patch by Ben Coverston, reviewed by brandonwilliams for CASSANDRA-5201
 2014-03-05 11:21:35 -06:00
Brandon Williams 4cd434f465 Merge branch 'cassandra-2.1' into trunk 2014-02-25 15:52:13 -06:00
Brandon Williams 7bd23316e9 Add new stress deps to packaging. 
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6762
 2014-02-25 15:51:25 -06:00
Aleksey Yeschenko 2621707128 Remove CQL2 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5918
 2014-02-20 22:36:28 +03:00
Jonathan Ellis f628bd8a4d Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-18 11:22:24 -06:00
Jonathan Ellis 500c62d6b9 Allow per-dc enabling of hints 
patch by Sankalp Kohli; reviewed by Lyuben Todorov for CASSANDRA-6157
 2014-02-18 11:21:13 -06:00
Sylvain Lebresne 1828b929c2 Remove now unused depency on snaptree 2014-02-17 17:23:04 +01:00
Sylvain Lebresne 9f14856234 Versions and licenses in preparation for 2.1.0-beta1 release 2014-02-17 17:06:10 +01:00
Jonathan Ellis ee020c9446 Revert 6157 until we can commit to 2.0 and merge forwards 
This reverts commit f64b31c426.
 2014-02-15 11:38:51 -06:00
Jonathan Ellis f64b31c426 wip 2014-02-15 10:18:12 -06:00
Mikhail Stepura 21ec021831 Fix eclipse build for trunk 2014-02-14 12:08:26 -08:00
Brandon Williams f007a35357 Use EB HadoopCompat for compat with Hadoop 0.2.x 
Patch by Ben Coversaton, reviewed by brandonwilliams for CASSANDRA-5201
 2014-02-11 15:53:43 -06:00
Brandon Williams b9aece45e9 Use EB HadoopCompat for compat with Hadoop 0.2.x 
Patch by Ben Coversaton, reviewed by brandonwilliams for CASSANDRA-5201
 2014-02-11 09:34:49 -06:00
Brandon Williams 01cf29c3e9 Merge branch 'cassandra-2.0' into trunk 2014-02-07 13:19:50 -06:00
Brandon Williams 130d135a63 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-02-07 13:19:38 -06:00
Brandon Williams c70f6d80bd add target to run specific test methods 2014-02-07 13:19:26 -06:00
Mikhail Stepura 88bef0cbf3 Switched to Guava 16.0 for CASSANDRA-6639 2014-02-06 20:22:28 -08:00
Yuki Morishita 0f83a8610b update stream-lib for HLL++ serialization thread-safety 2014-02-05 20:44:20 -06:00
Sylvain Lebresne 178e086f1a Update news, version in preparation for 1.2.15 2014-02-05 08:47:20 +01:00
Aleksey Yeschenko aa29b6af6a Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
	src/java/org/apache/cassandra/db/context/CounterContext.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
 2014-02-02 02:37:14 -05:00
Brandon Williams 944c015175 unify test timeouts, exclude pig 2014-01-31 22:11:01 +01:00
Brandon Williams 8ecc6f1118 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-01-31 14:08:15 -06:00
Brandon Williams 3f9875c7f5 exclude pig from test target 2014-01-31 14:08:07 -06:00
Brandon Williams 23e86ee15c Merge branch 'cassandra-1.2' into cassandra-2.0 2014-01-31 12:20:41 -06:00
Brandon Williams 9a024b8018 unify test timeouts, exclude pig 2014-01-31 12:20:18 -06:00
Sylvain Lebresne bcb294de08 Update version for 2.0.5 release 2014-01-31 16:06:12 +01:00
Sylvain Lebresne 6a9314408c Update versions and licenses for 1.2.14 release 2014-01-31 10:45:03 +01:00
Jonathan Ellis 4b54b8acd2 remove Table.switchlock and introduce o.a.c.utils.memory package 
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-5549
 2014-01-30 17:09:18 -06:00
Jonathan Ellis 2ba394676d bundle jna 4.0 
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5872
 2014-01-28 16:41:33 -06:00
Pavel Yaskevich 25d2893dd0 Merge branch 'cassandra-2.0' into trunk 2014-01-10 17:25:40 -08:00
Pavel Yaskevich c543215918 update thrift-server to version 0.3.3 to fix CASSANDRA-6373 and CASSANDRA-6407 2014-01-10 17:20:22 -08:00
Jonathan Ellis 892d8e699c refactor nodetool, encapsulating each command into a subclass 
patch by Clément Lardeur; reviewed by Mikhail Stepura for CASSANDRA-6381
 2014-01-10 12:12:34 -06:00
Eric Evans d56f8f2930 Update versioning for 2.0.4 release 2013-12-27 12:42:15 -06:00
belliottsmith 2e1e98ad04 Improve Stress Tool 
patch by Benedict; reviewed by Pavel Yaskevich for CASSANDRA-6199
 2013-12-23 18:05:43 -08:00
Dave Brosius 27dea4b938 add stream.jar to the poms 2013-12-22 00:17:14 -05:00
Brandon Williams 343a6472d8 Pig: fix duplicate schema error 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6309
 2013-12-13 11:40:20 -06:00
Sylvain Lebresne 6ab82a4698 Update versions for 1.2.13 release 2013-12-11 15:17:25 +01:00
Brandon Williams f7efaffada Pig: fix duplicate schema alias 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6309
 2013-12-05 16:14:43 -06:00
Jonathan Ellis 57e959d88a Merge branch 'cassandra-2.0' into trunk 2013-11-27 10:44:21 -06:00
Jonathan Ellis ef33f9543e move pig-test out of normal unit tests (still part of test-all) 2013-11-27 10:43:45 -06:00
Sylvain Lebresne c11bbecec8 Update version for 2.0.3 release 2013-11-21 10:07:40 +01:00
Sylvain Lebresne 026865f2a3 Update versions, licenses for 1.2.12 release 2013-11-20 09:43:28 +01:00
Sylvain Lebresne 9bf5b45d88 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	build.xml
	lib/lz4-1.1.2.jar
 2013-10-23 11:25:12 +02:00
Sylvain Lebresne 93da683e0c Update LZ4 lib to 1.2.0 2013-10-23 11:20:23 +02:00
Sylvain Lebresne f895ad4f0f Merge branch 'cassandra-2.0' into trunk 2013-10-23 10:22:28 +02:00
Sylvain Lebresne f8027ed8c8 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-23 10:22:12 +02:00
Sylvain Lebresne f388a2eb88 Use smaller stack size for tests 2013-10-23 10:21:48 +02:00
Sylvain Lebresne b6147c1c7b License and versions for 2.0.2 release 2013-10-22 18:01:51 +02:00
Jonathan Ellis 78cad84aee Merge branch 'cassandra-2.0' into trunk 2013-10-17 23:11:41 +01:00
Jonathan Ellis 229da37256 merge from 1.2 2013-10-17 23:10:38 +01:00
Jonathan Ellis c5368c70f2 Add a warning for small LCS sstable size 
patch by jbellis; reviewed by Jeremiah Jordan for CASSANDRA-6191
 2013-10-17 23:09:36 +01:00
Sylvain Lebresne 6165840f15 Versions and license for 1.2.11 release 2013-10-15 09:21:10 +02:00
Brandon Williams 0f13031023 Merge branch 'cassandra-2.0' into trunk 
Conflicts:
	build.xml
	test/conf/log4j-junit.properties
 2013-10-14 14:19:20 -05:00