Commit Graph

122 Commits

Author SHA1 Message Date
Sylvain Lebresne 41bb4bcd09 Update CQL doc for CASSANDRA-6839 (non equal conditions in LWT)
patch by slebresne; reviewed by blerer for CASSANDRA-10752
2016-03-17 10:18:32 +01:00
Marcus Eriksson b8408f068b Make it clear what timestamp_resolution is used for
Patch by marcuse; reviewed by Jeff Jirsa for CASSANDRA-11041
2016-02-09 07:08:22 +01:00
Sylvain Lebresne e438831377 Remove "atomic" wording for batches in CQL doc (CASSANDRA-10701) 2015-12-22 11:52:36 +01:00
blerer 4e3555c1d9 Make "truncate table X" an alias for "truncate X"
patch by Benjamin Lerer; reviewed by Robert Stupp  for CASSANDRA-9585
2015-09-17 22:02:45 +02:00
Paulo Motta 3b46e5bda6 Document post-2.1 caching table options syntax
patch by Paulo Motta; reviewed by Benjamin Lerer for CASSANDRA-9964
2015-09-16 10:11:47 +02:00
Marcus Eriksson df9e798de6 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-08-20 18:15:43 +02:00
Marcus Eriksson 500c035d21 Update CQL docs with DateTieredCompactionStrategy
Patch by marcuse; reviewed by yukim for CASSANDRA-8199
2015-08-20 18:14:41 +02:00
Tyler Hobbs 8934a0298e Fix identifier regex in CQL documentation
The regex was correct, but for some reason it wasn't generating the
correct HTML.
2015-06-16 12:31:43 -05:00
Sam Tunnicliffe 14a332470c Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
2015-06-01 18:12:50 +01:00
Sam Tunnicliffe 63819cbee3 Update CQL docs with auth and DCL info
Patch by Sam Tunnicliffe; reviewed by Tyler Hobbs for CASSANDRA-7558
2015-06-01 18:08:31 +01:00
Joshua McKenzie 7f29201ce2 Revert "Add date and time types" on 2.1 branch
This reverts commit 107545b392.

Conflicts:
	CHANGES.txt
	NEWS.txt
	bin/cqlsh
	pylib/cqlshlib/test/test_keyspace_init.cql
2015-04-21 08:42:31 -05:00
Joshua McKenzie 107545b392 Add date and time types
Patch by jmckenzie; reviewed by thobbs and cyeksigian for CASSANDRA-7523
2015-03-09 12:20:28 -05:00
Tyler Hobbs 59ed491ac8 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-05 12:54:40 -06:00
Jon Åslund d04602d3da Fix link to CREATE KEYSPACE in CQL3 docs
Patch by Jon Åslund; reviewed by Tyler Hobbs
2015-03-05 12:54:01 -06:00
Tyler Hobbs f6d82a55fb Merge branch 'cassandra-2.0' into cassandra-2.1 2015-03-03 14:02:47 -06:00
Tyler Hobbs 6ee0c757c3 Document bind markers for TIMESTAMP, TLL, and LIMIT
Patch by Tyler Hobbs for CASSANDRA-8889
2015-03-03 14:01:43 -06:00
Tyler Hobbs 1512264703 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-02-06 16:38:06 -06:00
Tyler Hobbs 08deff70a0 Clarify default timestamp in CQL docs
Patch by Tyler Hobbs for CASSANDRA-8538
2015-02-06 16:37:45 -06:00
Aleksey Yeschenko 90144989fe Merge branch 'cassandra-2.0' into cassandra-2.1 2015-02-05 02:54:32 +03:00
Jon Haddad 1467b9f787 Add default_time_to_live details to CQL 3 documentation
patch by Jon Haddad; reviewed by Aleksey Yeschenko for CASSANDRA-8742
2015-02-05 02:52:33 +03:00
Mikhail Stepura 1456ec8318 (cqlsh) tab completion for triggers
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7824
2014-09-09 15:03:57 -07:00
Tyler Hobbs 4cdfa85156 Ninja: fix index name spec for CREATE INDEX in CQL docs
Follow-up for CASSANDRA-7527
2014-07-23 12:05:00 -05:00
Tyler Hobbs 6b988fddd0 Ninja: fix grammar for tuple type in CQL docs
Follow up for CASSANDRA-7527
2014-07-16 15:36:58 -05:00
Tyler Hobbs e60b4e6d1d Bump CQL version to 3.2.0 and update CQL docs
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7527
2014-07-15 18:18:15 -05:00
Tyler Hobbs 6a4144b418 Add optional keyspace to DROP INDEX statement
Patch by Andrés de la Peña; review by Tyler Hobbs for CASSANDRA-7314
2014-06-03 17:32:17 -05:00
Aleksey Yeschenko a8d18c9c19 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
2014-05-29 23:00:03 +03:00
Aleksey Yeschenko 7216639e51 Add conditional CREATE/DROP USER support
patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-7264
2014-05-29 22:55:38 +03:00
Marcus Eriksson 86b6ec5299 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
2014-05-27 10:43:50 +02:00
Marcus Eriksson 367c741931 Add option to do more aggressive tombstone compaction.
Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-6563
2014-05-27 10:39:17 +02:00
Tyler Hobbs 0b9b1fca0a Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-23 11:21:01 -05:00
Tyler Hobbs 926f639a53 Bump CQL version to 3.1.7, update CQL docs
Follow up for CASSANDRA-6875
2014-05-23 11:20:10 -05:00
Tyler Hobbs a89fd4d1d6 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-08 15:59:03 -05:00
Tyler Hobbs 46f7f84cea Ninja: add missing "enabled" option to compaction options docs
Done for CASSANDRA-7185
2014-05-08 15:57:35 -05:00
Tyler Hobbs 1491f75dd6 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-01 13:05:52 -05:00
Tyler Hobbs 427fdd476a Document lack of order guarantees for BATCH statements
Patch by Tyler Hobbs, reviewed by Sylvain Lebresnse and Alex Popescu for
CASSANDRA-7123
2014-05-01 13:03:56 -05:00
Sylvain Lebresne 3e6b299256 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-04-22 10:12:47 +02:00
Sylvain Lebresne 48d7e40808 Fix CQL version number for CASSANDRA-7055 2014-04-22 10:12:19 +02:00
Tyler Hobbs 2a2141ce65 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
2014-03-19 11:42:45 -05:00
Tyler Hobbs c80f61b682 Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
	CHANGES.txt
2014-03-19 11:40:40 -05:00
Jonathan Ellis a45fea8fc6 merge from 2.0 2014-03-19 11:38:54 -05:00
Carl Yeksigian 32c15c2fb0 Add uuid() function
patch by Carl Yeksigian; reviewed by jbellis for CASSANDRA-6473
2014-03-19 11:38:26 -05:00
Tyler Hobbs 7e870018dc Add UNLOGGED, COUNTER options to BATCH docs
patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-6816
2014-03-19 11:37:09 -05:00
Mikhail Stepura d227aa0ec3 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-13 15:42:39 -07:00
Mikhail Stepura bed60fb6e5 Ninja-commit for "Add LZ4Compressor in CQL document" CASSANDRA-6331 2014-03-13 15:41:48 -07:00
Aleksey Yeschenko 362148dd23 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/service/StorageProxy.java
2014-03-11 15:20:45 +03:00
Sylvain Lebresne 3f38361271 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-10 18:02:46 +01:00
Sylvain Lebresne dfd28d226a Fix CQL doc 2014-03-10 18:02:30 +01:00
Brandon Williams 7e9cdff968 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-27 13:57:48 -06:00
Brandon Williams 33c75e92ee Merge branch 'cassandra-1.2' into cassandra-2.0 2014-02-27 13:57:28 -06:00
Sylvain Lebresne 034ac7d0fc Document that TTL <= 0 means no TTL 2014-02-25 09:54:11 +01:00