[2/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

2016-02-03 Thread jake 
Merge branch 'cassandra-3.0' into cassandra-3.3


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f240c95f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f240c95f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f240c95f

Branch: refs/heads/cassandra-3.3
Commit: f240c95f5de32585b00c530fe248965d05fdf84d
Parents: 233e785 21380fc
Author: T Jake Luciani 
Authored: Wed Feb 3 08:57:50 2016 -0500
Committer: T Jake Luciani 
Committed: Wed Feb 3 08:57:50 2016 -0500

--

--

[2/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

2016-01-26 Thread jasobrown 
Merge branch 'cassandra-3.0' into cassandra-3.3


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61c93e78
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61c93e78
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61c93e78

Branch: refs/heads/trunk
Commit: 61c93e78fd6ec0413505ccbcc80b53cbbef68f45
Parents: c146983 4ac4335
Author: Jason Brown 
Authored: Tue Jan 26 05:38:17 2016 -0800
Committer: Jason Brown 
Committed: Tue Jan 26 05:38:17 2016 -0800

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/io/util/Memory.java   | 2 +-
 src/java/org/apache/cassandra/utils/FastByteOperations.java | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61c93e78/CHANGES.txt
--
diff --cc CHANGES.txt
index 81657f9,57e985d..bac9a03
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
 -3.0.3
 +3.3
 + * Avoid bootstrap hanging when existing nodes have no data to stream 
(CASSANDRA-11010)
 +Merged from 3.0:
+  * Added support for IBM zSystems architecture (CASSANDRA-11054)
   * Update CQL documentation (CASSANDRA-10899)
   * Check the column name, not cell name, for dropped columns when reading
 legacy sstables (CASSANDRA-11018)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/61c93e78/src/java/org/apache/cassandra/utils/FastByteOperations.java
--

[2/3] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.3

2016-01-21 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.3


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83064bfd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83064bfd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83064bfd

Branch: refs/heads/trunk
Commit: 83064bfd58092c263c130b51d89404376c2d891f
Parents: fd08e75 7226718
Author: Benjamin Lerer 
Authored: Thu Jan 21 12:03:45 2016 +0100
Committer: Benjamin Lerer 
Committed: Thu Jan 21 12:03:45 2016 +0100

--
 CHANGES.txt  |  1 +
 doc/cql3/CQL.textile | 25 +
 2 files changed, 14 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/83064bfd/CHANGES.txt
--
diff --cc CHANGES.txt
index a9ba475,89d34ec..ca529fc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
 -3.0.3
 +3.3
 + * Avoid bootstrap hanging when existing nodes have no data to stream 
(CASSANDRA-11010)
 +Merged from 3.0:
+  * Update CQL documentation (CASSANDRA-10899)
   * Check the column name, not cell name, for dropped columns when reading
 legacy sstables (CASSANDRA-11018)
   * Don't attempt to index clustering values of static rows (CASSANDRA-11021)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/83064bfd/doc/cql3/CQL.textile
--

[2/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3

2016-01-21 Thread tylerhobbs 
Merge branch 'cassandra-3.0' into cassandra-3.3


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f728c4e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f728c4e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f728c4e3

Branch: refs/heads/cassandra-3.3
Commit: f728c4e34b68d21cb3c87b1e37913c444ea66da2
Parents: 83064bf a20b6ef
Author: Tyler Hobbs 
Authored: Thu Jan 21 13:17:57 2016 -0600
Committer: Tyler Hobbs 
Committed: Thu Jan 21 13:17:57 2016 -0600

--

--

[2/3] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.3

2016-01-15 Thread blerer 
Merge branch cassandra-3.0 into cassandra-3.3


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b48d71cc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b48d71cc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b48d71cc

Branch: refs/heads/trunk
Commit: b48d71cc67b6fc950ba6fe57a315e504b1eef9ee
Parents: c35484a 97e8953
Author: Benjamin Lerer 
Authored: Fri Jan 15 11:17:41 2016 +0100
Committer: Benjamin Lerer 
Committed: Fri Jan 15 11:18:07 2016 +0100

--
 src/java/org/apache/cassandra/db/view/TemporalRow.java | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)
--